From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 28 Dec 2006 07:34:52 +0000 (-0500)
Subject: Honor GIT_REFLOG_ACTION in git-rebase.
X-Git-Tag: v1.5.0-rc1~177
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=42ea5a5784a60d1e9280d81619779edd870c2fcc;p=git.git

Honor GIT_REFLOG_ACTION in git-rebase.

To help correctly log actions caused by porcelain which invoke
git-reset directly we should honor the setting of GIT_REFLOG_ACTION
which we inherited from our caller.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-reset.sh b/git-reset.sh
index 2379db082..a9693701a 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -5,6 +5,7 @@
 USAGE='[--mixed | --soft | --hard]  [<commit-ish>] [ [--] <paths>...]'
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
+set_reflog_action "reset $*"
 
 update= reset_type=--mixed
 unset rev
@@ -81,7 +82,7 @@ then
 else
 	rm -f "$GIT_DIR/ORIG_HEAD"
 fi
-git-update-ref -m "reset $reset_type $*" HEAD "$rev"
+git-update-ref -m "$GIT_REFLOG_ACTION" HEAD "$rev"
 update_ref_status=$?
 
 case "$reset_type" in