From eb2151bb8938a8e2af86e3ed34243af7b1c95786 Mon Sep 17 00:00:00 2001
From: Thomas Rast <trast@student.ethz.ch>
Date: Fri, 12 Mar 2010 18:04:33 +0100
Subject: 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>
---
 git-am.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'git-am.sh')

diff --git a/git-am.sh b/git-am.sh
index 1056e7db6..7644474bc 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
-- 
cgit v1.2.1