Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
honor GIT_REFLOG_ACTION in git-commit
author
Junio C Hamano
<junkio@cox.net>
Sat, 20 Jan 2007 01:12:11 +0000
(17:12 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 3 Feb 2007 23:17:49 +0000
(15:17 -0800)
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>
git-commit.sh
patch
|
blob
|
history
git-revert.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
5f856dd
)
diff --git
a/git-commit.sh
b/git-commit.sh
index dc0fc3b679c78f2a1884658d556cc888a6d3e441..ec506d956fa2858897c53b35d28db8083b7fdcec 100755
(executable)
--- 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 866d622d2344a4bd1fea579fd5d1d6aee6615eee..49f00321b28833c24ebb78ea2104f34091d43017 100755
(executable)
--- 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