diff options
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 26afc75cc7..16d18176ec 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -3,8 +3,6 @@ # Copyright (c) 2010 Junio C Hamano. # -. git-sh-setup - prec=4 read_state () { @@ -90,12 +88,14 @@ 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. } @@ -109,7 +109,7 @@ continue) continue_merge done finish_rb_merge - exit + return ;; skip) read_state @@ -121,7 +121,7 @@ skip) continue_merge done finish_rb_merge - exit + return ;; esac |