* Correct GIT_CONFIG settings in git-svn. Closes: #463941

diff --git a/debian/changelog b/debian/changelog
index b2a078024b0ad6c409313e9eac6a2f1c45650a56..6f3970ca51c12b2a23a3301409518e76f2285751 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (0.24) unstable; urgency=low
+
+  * Correct GIT_CONFIG settings in git-svn. Closes: #463941
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 06 Feb 2008 13:04:30 -0500
+
 mr (0.23) unstable; urgency=low
 
   * Fix tests in git-svn include file to use MR_REPO. Closes: #463941

diff --git a/lib/git-svn b/lib/git-svn
index 5f42f5479839525d14f3d46f6b59166202b1b364..3fe18a25d94d18b1a36895b52defe7c14a1f831c 100644 (file)
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -17,11 +17,11 @@ 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