Skip to content

Commit

Permalink
Only call git-rerere if $GIT_DIR/rr-cache exists.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Feb 12, 2006
1 parent 7bbdeaa commit 1536dd9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
5 changes: 4 additions & 1 deletion git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
5 changes: 4 additions & 1 deletion git-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,10 @@ else
fi
ret="$?"
rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
git-rerere
if test -d "$GIT_DIR/rr-cache"
then
git-rerere
fi

if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
then
Expand Down
5 changes: 4 additions & 1 deletion git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 1536dd9

Please sign in to comment.