From: Junio C Hamano <junkio@cox.net>
Date: Sat, 20 Jan 2007 01:12:11 +0000 (-0800)
Subject: honor GIT_REFLOG_ACTION in git-commit
X-Git-Tag: v1.5.0-rc4~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=23913dc713a4f5b5228258919769ff1ab0a74a2b;p=git.git

honor GIT_REFLOG_ACTION in git-commit

This allows git-cherry-pick and git-revert to properly identify
themselves in the resulting reflog entries.  Earlier they were
recorded as what git-commit has done.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-commit.sh b/git-commit.sh
index dc0fc3b67..ec506d956 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -528,6 +528,7 @@ else
 	rloga='commit (initial)'
 	current=''
 fi
+set_reflog_action "$rloga"
 
 if test -z "$no_edit"
 then
@@ -602,7 +603,7 @@ then
 	fi &&
 	commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
 	rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
-	git-update-ref -m "$rloga: $rlogm" HEAD $commit "$current" &&
+	git-update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" &&
 	rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
 	if test -f "$NEXT_INDEX"
 	then
diff --git a/git-revert.sh b/git-revert.sh
index 866d622d2..49f00321b 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -54,6 +54,8 @@ do
 	shift
 done
 
+set_reflog_action "$me"
+
 test "$me,$replay" = "revert,t" && usage
 
 case "$no_commit" in