summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-03-12 17:04:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-13 05:55:40 (GMT)
commiteb2151bb8938a8e2af86e3ed34243af7b1c95786 (patch)
tree3662a91fb03bd6c76d6ff1caa3409eeacf72f18d /git-am.sh
parent6956f858f6237d426fa422949033e3c558104802 (diff)
downloadgit-eb2151bb8938a8e2af86e3ed34243af7b1c95786.zip
git-eb2151bb8938a8e2af86e3ed34243af7b1c95786.tar.gz
git-eb2151bb8938a8e2af86e3ed34243af7b1c95786.tar.bz2
rebase: support automatic notes copying
Luckily, all the support already happens to be there. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 1056e7d..7644474 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -780,8 +780,11 @@ do
go_next
done
-if test -s "$dotest"/rewritten && test -x "$GIT_DIR"/hooks/post-rewrite; then
+if test -s "$dotest"/rewritten; then
+ git notes copy --for-rewrite=rebase < "$dotest"/rewritten
+ if test -x "$GIT_DIR"/hooks/post-rewrite; then
"$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten
+ fi
fi
git gc --auto