diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-11 18:55:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-11 18:55:43 -0800 |
| commit | 1536dd9c61b5582cf079999057cb715dd6dc6620 (patch) | |
| tree | 29b1ba52a130a7da952ce161b7136003f9077527 /git-merge.sh | |
| parent | 7bbdeaa969794edd67cd4a1ed09b9a057b6af4c3 (diff) | |
| download | git-1536dd9c61b5582cf079999057cb715dd6dc6620.tar.gz | |
Only call git-rerere if $GIT_DIR/rr-cache exists.
Johannes noticed that git-rerere depends on Digest.pm, and if
one does not use the command, one can live without it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index dc17baf6e0..74f07610fa 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -309,6 +309,9 @@ Conflicts: sed -e 's/^[^ ]* / /' | uniq } >>"$GIT_DIR/MERGE_MSG" - git rerere + if test -d "$GIT_DIR/rr-cache" + then + git-rerere + fi die "Automatic merge failed; fix up by hand" fi |