Make mr help work even if the mrconfig file is busted. Thanks, Lorenzo Cappelletti

[code/myrepos.git] / lib / git-svn

diff --git a/lib/git-svn b/lib/git-svn
index bcdb545e4c7543710dcd72a21dc9dcb78726501c..212923a35cd77f2578030240f15ffc69801c51f7 100644 (file)
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -9,20 +9,20 @@
 # configure that as follows in your ~/.mrconfig:
 #git_svn_update = git svn rebase
 git_svn_update = git svn fetch
-git_svn_status = git status -s "$@" || true
+git_svn_status = git status -s "$@" || true; git --no-pager log --branches --not --remotes --simplify-by-decoration --decorate --oneline || true
 git_svn_commit = git svn dcommit
 git_svn_push = git svn dcommit
 git_svn_record = git commit -a "$@"
 git_svn_diff = git diff "$@"
 git_svn_log = git svn log "$@"
 
-git_test =
-       test -d "$MR_REPO"/.git &&
-       test -z "$(GIT_CONFIG="$MR_REPO"/.git/config git config --get svn-remote.svn.url)"
+git_test = perl:
+       -d "$ENV{MR_REPO}/.git" &&
+       `GIT_CONFIG="$ENV{MR_REPO}"/.git/config git config --get svn-remote.svn.url` eq ""
 
-git_svn_test =
-       test -d "$MR_REPO"/.git &&
-       test -n "$(GIT_CONFIG="$MR_REPO"/.git/config git config --get svn-remote.svn.url)"
+git_svn_test = perl:
+       -d "$ENV{MR_REPO}/.git" &&
+       `GIT_CONFIG="$ENV{MR_REPO}"/.git/config git config --get svn-remote.svn.url` ne ""
 
 git_svn_register =
        url="`LC_ALL=C git config --get svn-remote.svn.url`" || true