X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-commit.sh;h=59551d99f9672233da2d8d847f9f4d535dba26de;hb=687dd75c95f9212244b6cf4fe60b40db44de01ba;hp=073ec81e14e8aa55df913b4452ead35fb73d5134;hpb=9ae6be80163669db921e6522140900da41753ed5;p=git.git diff --git a/git-commit.sh b/git-commit.sh index 073ec81e..59551d99 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -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