From: Luben Tuikov <ltuikov@yahoo.com>
Date: Thu, 12 Oct 2006 22:11:07 GMT
Subject: [PATCH] git-revert: use GIT_DIR shell variable for the MERGE_MSG
Message-ID: <20061012221107.73011.qmail@web31804.mail.mud.yahoo.com>

Ooops!

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
---
 git-revert.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-revert.sh b/git-revert.sh
index 2e23cf4..6eab3c7 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -145,7 +145,7 @@ git-read-tree -m -u --aggressive $base $
 result=$(git-write-tree 2>/dev/null) || {
     echo >&2 "Simple $me fails; trying Automatic $me."
     git-merge-index -o git-merge-one-file -a || {
-	    mv -f .msg .git/MERGE_MSG
+	    mv -f .msg "$GIT_DIR/MERGE_MSG"
 	    {
 		echo '
 Conflicts:
-- 
1.4.3.rc2.gd9edb