* Fix tests in git-svn include file to use MR_REPO. Closes: #463941

diff --git a/debian/changelog b/debian/changelog
index 72a7fdea85f26d918da7d64a219517f4f6d34446..d8597a8ce35a7e281cee1a0c2127eef004c10a6b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (0.23) UNRELEASED; urgency=low
+
+  * Fix tests in git-svn include file to use MR_REPO. Closes: #463941
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 04 Feb 2008 13:36:22 -0500
+

 mr (0.22) unstable; urgency=low
 
   * Update bzr registration code to work with current version of bzr,
 mr (0.22) unstable; urgency=low
 
   * Update bzr registration code to work with current version of bzr,

diff --git a/lib/git-svn b/lib/git-svn
index 9457547d5fbef6f2469349ed8d14add02f3a4430..5f42f5479839525d14f3d46f6b59166202b1b364 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 &&
 
 git_test =
        test -d "$MR_REPO"/.git &&

-       test -z "`git config --get svn-remote.svn.url`"
+       test -z "$(GIT_CONFIG="$MR_REPO"/config git config --get svn-remote.svn.url)"

 
 git_svn_test =
        test -d "$MR_REPO"/.git &&
 
 git_svn_test =
        test -d "$MR_REPO"/.git &&

-       test -n "`git config --get svn-remote.svn.url`"
+       test -n "$(GIT_CONFIG="$MR_REPO"/config git config --get svn-remote.svn.url)"

 
 git_svn_register =
        url="`LC_ALL=C git config --get svn-remote.svn.url`" || true
 
 git_svn_register =
        url="`LC_ALL=C git config --get svn-remote.svn.url`" || true