### Archive

Posts Tagged ‘git’

## Convert subversion repository to GIT

First, you need to create a file that maps the subversion authors to GIT users (let’s say /tmp/svnusers). The syntax is pretty easy:

kmartin = Kirk Martin <marty@localhost.com>
mattaway = Marshal Attaway <marshal@localhost.com>


To get a list of all your SVN authors, run

$svn log --xml | grep author | sort -u | perl -pe 's/.>(.?)<./$1 = /'


on you subversion working copy.

Next, you have to create a temp directory (which will be cloned later to get rid of all the SVN stuff).

$mkdir /tmp/MyProject_tmp$ cd /tmp/MyProject_tmp


Now, you can fetch the SVN files from you subversion server

$git-svn init svn+ssh://user@SVNHost/MyProject/trunk/ --no-metadata$ git config svn.authorsfile /tmp/svnusers
$git-svn fetch  Please note, that you may need to adjust the protocol (svn+ssh, http, https, ftp, etc.), user, host, path to the project files etc. To get rid of all the SVN remains, simply clone the newly created GIT repo $ git clone MyProject_tmp MyProject

Categories: Uncategorized Tags:

## Display current git branch in bash

Sometimes it’s very useful to know which git branch you are working on right from the command prompt. There are many solutions out there, but most of them include python and some awk or grep magic which can time a serious amount of time when you cd into a reasonably large git tree.

But you can also take advantage of the __git_ps1 function, provided by /etc/bash_completion.d/git in the git package. Add this line to ~/.bashrc:

export PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '


This setting helps you keep track of which branch you are in at a given time. If you are in a git working directory, it shows the current branch as part of the prompt:

[user@host directory-name (master)]$ If you do not have the bash-completion package installed, you must manually source the git completion script prior to using __git_ps1(). To do this, add source /etc/bash_completion.d/git  to ~/.bashrc. You might also want to display when there are changes in your work tree or the git index: [user@host directory-name (master*)]$
[user@host directory-name (master+)]$[user@host directory-name (master%)]$

• * indicates that a tracked file was modified
• + indicates that a tracked file was modified and staged (with git add)
• % indicates that you have untracked files in your tree

To do so, simply add these lines in your ~/.bashrc, right before the line modifying your prompt:

export GIT_PS1_SHOWDIRTYSTATE=true
export GIT_PS1_SHOWUNTRACKEDFILES=true


See the comments at the beginning of /etc/bash_completion.d/git for more details.

Categories: Uncategorized Tags: