kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2006-02-11 18:55:43 -08:00
parent 7bbdeaa969
commit 1536dd9c61
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-am.sh
View File

@ -88,7 +88,10 @@ fall_back_3way () {
# saying that we reverted all those changes. # saying that we reverted all those changes.


git-merge-resolve $orig_tree -- HEAD $his_tree || { 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. echo Failed to merge in the changes.
exit 1 exit 1
} }

5
git-commit.sh
View File

@ -638,7 +638,10 @@ else
fi fi
ret="$?" ret="$?"
rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" 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 if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
then then

5
git-merge.sh
View File

@ -309,6 +309,9 @@ Conflicts:
sed -e 's/^[^ ]* / /' | sed -e 's/^[^ ]* / /' |
uniq uniq
} >>"$GIT_DIR/MERGE_MSG" } >>"$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" die "Automatic merge failed; fix up by hand"
fi fi