summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2006-07-22 13:39:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-24 06:35:29 (GMT)
commit51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6 (patch)
tree88659b27d3635ee935322769bd1e29e1a9470597 /contrib/emacs
parentd0d8f7dc5ffe029d3fc047fb7ffecd7ecfb6601c (diff)
downloadgit-51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6.zip
git-51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6.tar.gz
git-51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6.tar.bz2
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>
Diffstat (limited to 'contrib/emacs')
-rw-r--r--contrib/emacs/git.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 34c9950..7371d4b 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))