From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 22 Jul 2006 13:39:02 +0000 (+0200)
Subject: git.el: Run git-rerere on commits if the rr-cache directory exists.
X-Git-Tag: v1.4.2-rc2~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6;p=git.git

git.el: Run git-rerere on commits if the rr-cache directory exists.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 34c995046..7371d4b46 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -584,6 +584,8 @@ and returns the process output as a string."
                             (condition-case nil (delete-file ".git/MERGE_HEAD") (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-refresh-files)
                             (git-refresh-ewoc-hf git-status)
                             (message "Committed %s." commit))