diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-26 16:42:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-26 16:42:35 -0800 |
| commit | 4d06691eeca5712319a7e8cf2085d081dca9ea47 (patch) | |
| tree | 961407cb13c26eeeea6aff0af9146e33eea3d75c /git-rebase--merge.sh | |
| parent | 09ccbd34f4fe37a682a10b23d86f915b2a8a9c28 (diff) | |
| parent | c524ceb12f65e2ad4fc68c9d5b39f6e4b6b5c17b (diff) | |
| download | git-4d06691eeca5712319a7e8cf2085d081dca9ea47.tar.gz git-4d06691eeca5712319a7e8cf2085d081dca9ea47.tar.xz | |
Sync with 1.7.8.5
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 11 |
1 files changed, 7 insertions, 4 deletions
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. |