From 1536dd9c61b5582cf079999057cb715dd6dc6620 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 11 Feb 2006 18:55:43 -0800 Subject: 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 --- git-merge.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'git-merge.sh') 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 -- cgit v1.2.1