Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index f60017948f4eb45f6aa7fe0fc60ca1507cec98f2..457f95fc0599b32fb6da20c59094cd77d7f6f252 100644 (file)
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -681,8 +681,7 @@ and returns the process output as a string."
                             (condition-case nil (delete-file ".git/MERGE_MSG") (error nil))
                             (with-current-buffer buffer (erase-buffer))
                             (git-set-files-state files 'uptodate)
-                            (when (file-directory-p ".git/rr-cache")
-                              (git-run-command nil nil "rerere"))
+                            (git-run-command nil nil "rerere")
                             (git-refresh-files)
                             (git-refresh-ewoc-hf git-status)
                             (message "Committed %s." commit)