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>
This commit is contained in:
		 Alexandre Julliard
					Alexandre Julliard
				
			
				
					committed by
					
						 Junio C Hamano
						Junio C Hamano
					
				
			
			
				
	
			
			
			 Junio C Hamano
						Junio C Hamano
					
				
			
						parent
						
							d0d8f7dc5f
						
					
				
				
					commit
					51a6e56fb7
				
			| @ -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)) | ||||
|  | ||||
		Reference in New Issue
	
	Block a user