From 42ea5a5784a60d1e9280d81619779edd870c2fcc Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 28 Dec 2006 02:34:52 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-reset.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-reset.sh b/git-reset.sh index 2379db082f..a9693701a3 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -5,6 +5,7 @@ USAGE='[--mixed | --soft | --hard] [] [ [--] ...]' 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 -- 2.11.4.GIT