rebase -m: only call "notes copy" when rewritten exists and is non-empty
This prevents a shell error complaining rebase-merge/rewritten doesn't exist. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andrew Wong committed
Feb 24, 2012 at 23:31 UTC
ad687b447a87efaf61c39075da2ef81b85715186
1 file changed
+7
-4
git-rebase--merge.sh
+7
-4
@@ -90,10 +90,13 @@ call_merge () {
90
91
finish_rb_merge () {
92
move_to_original_branch
93
- git notes copy --for-rewrite=rebase < "$state_dir"/rewritten
94
- if test -x "$GIT_DIR"/hooks/post-rewrite &&
95
- test -s "$state_dir"/rewritten; then
96
- "$GIT_DIR"/hooks/post-rewrite rebase < "$state_dir"/rewritten
93
+ if test -s "$state_dir"/rewritten
94
+ then
95
+ git notes copy --for-rewrite=rebase <"$state_dir"/rewritten
96
+ if test -x "$GIT_DIR"/hooks/post-rewrite
97
+ then
98
+ "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
99
+ fi
100
fi
101
rm -r "$state_dir"
102
say All done.