Browse Source

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>
maint
Alexandre Julliard 19 years ago committed by Junio C Hamano
parent
commit
51a6e56fb7
  1. 2
      contrib/emacs/git.el

2
contrib/emacs/git.el

@ -584,6 +584,8 @@ and returns the process output as a string." @@ -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))

Loading…
Cancel
Save