mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Set minimum number of commits for gitmerge in batch mode

Browse Source 
* admin/gitmerge.el (gitmerge-minimum-missing): New variable.
(gitmerge): In batch mode, respect gitmerge-minimum-missing.
This commit is contained in:
Glenn Morris 2017-12-18 19:56:21 -05:00
parent 2a8d2d5daf
commit 066b65d03d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/gitmerge.el
View File

@ -63,6 +63,9 @@ bump version\\|Auto-commit"))
"Regexp matching logs of revisions that might be skipped.
`gitmerge-missing' will ask you if it should skip any matches.")
(defvar gitmerge-minimum-missing 10
"Minimum number of missing commits to consider merging in batch mode.")
(defvar gitmerge-status-file (expand-file-name "gitmerge-status"
user-emacs-directory)
"File where missing commits will be saved between sessions.")
@ -567,6 +570,12 @@ Branch FROM will be prepended to the list."
(setq gitmerge--from from)
(when (null gitmerge--commits)
(user-error "Nothing to merge"))
(and noninteractive
gitmerge-minimum-missing
(< (length gitmerge--commits) gitmerge-minimum-missing)
(user-error "Number of missing commits (%s) is less than %s"
(length gitmerge--commits)
gitmerge-minimum-missing))
(with-current-buffer
(gitmerge-setup-log-buffer gitmerge--commits gitmerge--from)
(goto-char (point-min))