diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-28 02:34:52 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 01:05:45 -0800 |
| commit | 42ea5a5784a60d1e9280d81619779edd870c2fcc (patch) | |
| tree | 3b110668991379bd647d399b4200ca6554f1d08a /git-reset.sh | |
| parent | f94741324e26af42093a89e955ff9a923abff951 (diff) | |
| download | git-42ea5a5784a60d1e9280d81619779edd870c2fcc.tar.gz git-42ea5a5784a60d1e9280d81619779edd870c2fcc.tar.xz | |
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-x | git-reset.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |