[PATCH] rebase -m: only call "notes copy" when rewritten exists and is non-empty
From: Andrew Wong <hidden>
Date: 2016-06-15 22:53:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
This prevents a shell error complaining rebase-merge/rewritten doesn't exist. Signed-off-by: Andrew Wong <redacted> --- git-rebase--merge.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 26afc75..5e9d95f 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh@@ -90,10 +90,11 @@ 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.
--
1.7.9.2.263.g07763