Browse Source

honor GIT_REFLOG_ACTION in git-commit

This allows git-cherry-pick and git-revert to properly identify
themselves in the resulting reflog entries.  Earlier they were
recorded as what git-commit has done.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 18 years ago
parent
commit
23913dc713
  1. 3
      git-commit.sh
  2. 2
      git-revert.sh

3
git-commit.sh

@ -528,6 +528,7 @@ else @@ -528,6 +528,7 @@ else
rloga='commit (initial)'
current=''
fi
set_reflog_action "$rloga"

if test -z "$no_edit"
then
@ -602,7 +603,7 @@ then @@ -602,7 +603,7 @@ then
fi &&
commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
git-update-ref -m "$rloga: $rlogm" HEAD $commit "$current" &&
git-update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" &&
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
if test -f "$NEXT_INDEX"
then

2
git-revert.sh

@ -54,6 +54,8 @@ do @@ -54,6 +54,8 @@ do
shift
done

set_reflog_action "$me"

test "$me,$replay" = "revert,t" && usage

case "$no_commit" in

Loading…
Cancel
Save