undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Honor GIT_REFLOG_ACTION in git-rebase.

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce 2006-12-28 02:34:52 -05:00 committed by Junio C Hamano
parent f94741324e
commit 42ea5a5784
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-reset.sh
View File

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