diff --git a/plugins/git-svn/git-svn.plugin.zsh b/plugins/git-svn/git-svn.plugin.zsh new file mode 100644 index 000000000..26d49db74 --- /dev/null +++ b/plugins/git-svn/git-svn.plugin.zsh @@ -0,0 +1,24 @@ +# Git and svn mix +alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' +compdef git-svn-dcommit-push=git + +alias gsr='git svn rebase' +alias gsd='git svn dcommit' + +# +# git equivalent of svnversion +# +get_svnversion() +{ + local git_version=`git describe --always 2>/dev/null` + local git_svnversion=`git svn find-rev $git_version 2>/dev/null` + local svn_version + LANG=C svn_version=`/usr/bin/svnversion` + if [ "X$svn_version" == "Xexported" -o "X$svn_version" == "X" ]; then + echo $git_svnversion + else + echo $svn_version + fi +} +alias svnversion=get_svnversion + diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index d3d3f702a..cc77ca7f3 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -39,12 +39,6 @@ compdef _git gm=git-merge alias grh='git reset HEAD' alias grhh='git reset HEAD --hard' -# Git and svn mix -alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' -compdef git-svn-dcommit-push=git - -alias gsr='git svn rebase' -alias gsd='git svn dcommit' # # Will return the current branch name # Usage example: git pull origin $(current_branch)