From a782986cb013ac2ee9160feff7eb0ebb6664549c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Feb 2008 13:05:02 -0500 Subject: [PATCH] * Correct GIT_CONFIG settings in git-svn. Closes: #463941 --- debian/changelog | 6 ++++++ lib/git-svn | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2a0780..6f3970c 100644 --- 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 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 5f42f54..3fe18a2 100644 --- 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 -- 2.39.2