diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-19 17:12:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 15:17:49 -0800 |
| commit | 23913dc713a4f5b5228258919769ff1ab0a74a2b (patch) | |
| tree | 2ab9a508f4c3ca1ec5806921349f32373526edcd | |
| parent | 5f856dd47dacb30fb9f605b4b7e1fa577ada7d26 (diff) | |
| download | git-23913dc713a4f5b5228258919769ff1ab0a74a2b.tar.gz git-23913dc713a4f5b5228258919769ff1ab0a74a2b.tar.xz | |
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>
| -rwxr-xr-x | git-commit.sh | 3 | ||||
| -rwxr-xr-x | git-revert.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/git-commit.sh b/git-commit.sh index dc0fc3b67..ec506d956 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -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 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 866d622d2..49f00321b 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 |