[PATCH] git-revert: use GIT_DIR shell variable for the MERGE_MSG

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Ooops!

Signed-off-by: Luben Tuikov <ltuikov@xxxxxxxxx>
---
 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


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]