diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-26 17:13:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-26 17:39:04 -0800 |
| commit | 80809062452a65146d73ae483415acbc737fabf1 (patch) | |
| tree | d5b65e07896705f4dda05424a324fd455519d865 /git-rebase--merge.sh | |
| parent | ba998d33e22d6fce4445af5834dc227609672501 (diff) | |
| parent | 62ed0728fe52312f270760187b3280bc51b6c2f0 (diff) | |
| download | git-80809062452a65146d73ae483415acbc737fabf1.tar.gz git-80809062452a65146d73ae483415acbc737fabf1.tar.xz | |
Merge branch 'maint'
* maint:
Document accumulated fixes since 1.7.9.2
Git 1.7.8.5
grep -P: Fix matching ^ and $
am: don't infloop for an empty input file
rebase -m: only call "notes copy" when rewritten exists and is non-empty
git-p4: remove bash-ism in t9800
git-p4: remove bash-ism in t9809
git-p4: fix submit regression with clientSpec and subdir clone
git-p4: set useClientSpec variable on initial clone
Makefile: add thread-utils.h to LIB_H
Conflicts:
RelNotes
t/t9809-git-p4-client-view.sh
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. |