Skip to content

Commit

Permalink
git.el: Run git-rerere on commits if the rr-cache directory exists.
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Alexandre Julliard authored and Junio C Hamano committed Jul 24, 2006
1 parent d0d8f7d commit 51a6e56
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions contrib/emacs/git.el
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 51a6e56

Please sign in to comment.