Show the line when failing to parse a config file. Closes: #650952

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

diff --git a/lib/git-svn b/lib/git-svn
index 5f42f5479839525d14f3d46f6b59166202b1b364..bcdb545e4c7543710dcd72a21dc9dcb78726501c 100644 (file)
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -9,19 +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 "$@" || true
+git_svn_status = git status -s "$@" || 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"/config git config --get svn-remote.svn.url)"
+       test -z "$(GIT_CONFIG="$MR_REPO"/.git/config git config --get svn-remote.svn.url)"
 
 git_svn_test =
        test -d "$MR_REPO"/.git &&
-       test -n "$(GIT_CONFIG="$MR_REPO"/config git config --get svn-remote.svn.url)"
+       test -n "$(GIT_CONFIG="$MR_REPO"/.git/config git config --get svn-remote.svn.url)"
 
 git_svn_register =
        url="`LC_ALL=C git config --get svn-remote.svn.url`" || true