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-am.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'git-am.sh') diff --git a/git-am.sh b/git-am.sh index ee6886f300..98b9215f70 100755 --- a/git-am.sh +++ b/git-am.sh @@ -88,7 +88,10 @@ fall_back_3way () { # saying that we reverted all those changes. git-merge-resolve $orig_tree -- HEAD $his_tree || { - git-rerere + if test -d "$GIT_DIR/rr-cache" + then + git-rerere + fi echo Failed to merge in the changes. exit 1 } -- cgit v1.2.3