summaryrefslogtreecommitdiff
path: root/git-reset.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-28 07:34:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-28 09:05:45 (GMT)
commit42ea5a5784a60d1e9280d81619779edd870c2fcc (patch)
tree3b110668991379bd647d399b4200ca6554f1d08a /git-reset.sh
parentf94741324e26af42093a89e955ff9a923abff951 (diff)
downloadgit-42ea5a5784a60d1e9280d81619779edd870c2fcc.zip
git-42ea5a5784a60d1e9280d81619779edd870c2fcc.tar.gz
git-42ea5a5784a60d1e9280d81619779edd870c2fcc.tar.bz2
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>
Diffstat (limited to 'git-reset.sh')
-rwxr-xr-xgit-reset.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-reset.sh b/git-reset.sh
index 2379db0..a969370 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