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@xxxxxxx> --- diff --git a/git-commit.sh b/git-commit.sh index e23918c..eb211e5 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -524,6 +524,7 @@ else rloga='commit (initial)' current='' fi +set_reflog_action "$rloga" if test -z "$no_edit" then @@ -598,7 +599,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 diff --git a/git-revert.sh b/git-revert.sh index bb8f1ca..8207c9e 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -54,6 +54,8 @@ do shift done +set_reflog_action "$me" + test "$me,$replay" = "revert,t" && usage case "$no_commit" in - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html