summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-03-12 17:04:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-13 05:55:39 (GMT)
commit6f6bee3ba9260137f27bdcad2f8d0fac026f2b6d (patch)
tree8d1f9283b42e4d72d284f8c0bef3e917dd92c640 /git-rebase--interactive.sh
parentc0fc6869112e07cda2faff73670480df0d82d530 (diff)
downloadgit-6f6bee3ba9260137f27bdcad2f8d0fac026f2b6d.zip
git-6f6bee3ba9260137f27bdcad2f8d0fac026f2b6d.tar.gz
git-6f6bee3ba9260137f27bdcad2f8d0fac026f2b6d.tar.bz2
commit --amend: invoke post-rewrite hook
The rough structure of run_rewrite_hook() comes from run_receive_hook() in receive-pack. We introduce a --no-post-rewrite option and use it to avoid the hook when called from git-rebase -i 'edit'. The next patch will add full support in git-rebase, and we only want to invoke the hook once. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index c2f6089..4a69c38 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -445,7 +445,7 @@ do_next () {
mark_action_done
pick_one $sha1 ||
die_with_patch $sha1 "Could not apply $sha1... $rest"
- git commit --amend
+ git commit --amend --no-post-rewrite
;;
edit|e)
comment_for_reflog edit