X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase--merge.sh;h=dc599077f0e55472ae814ed4e15f5b3a1b729caf;hb=6eab5f2f14806cf6a7b665d96766a59c13a41f4b;hp=26afc75cc7d0fbf3de69325043130836c32454a0;hpb=df6840855d24c2f54c0b8a66cbac33d8af43333a;p=git.git

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 26afc75cc..dc599077f 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -90,10 +90,13 @@ call_merge () {
 
 finish_rb_merge () {
 	move_to_original_branch
-	git notes copy --for-rewrite=rebase < "$state_dir"/rewritten
-	if test -x "$GIT_DIR"/hooks/post-rewrite &&
-		test -s "$state_dir"/rewritten; then
-		"$GIT_DIR"/hooks/post-rewrite rebase < "$state_dir"/rewritten
+	if test -s "$state_dir"/rewritten
+	then
+		git notes copy --for-rewrite=rebase <"$state_dir"/rewritten
+		if test -x "$GIT_DIR"/hooks/post-rewrite
+		then
+			"$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
+		fi
 	fi
 	rm -r "$state_dir"
 	say All done.