pestctrl/emacs-config
1
0
Fork 0
mirror of https://github.com/pestctrl/emacs-config.git synced 2026-02-16 08:14:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't stop merging just because one of them failed

Browse source 
Also, on puppet's computer, don't pop the output-buffer.
This commit is contained in:
Puppet 2022-12-04 11:25:37 -06:00
parent f78bbf3a74
commit cda1d2a56d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/git-auto-sync/git-auto-fast-forward-mode.el
View file

@ -89,8 +89,9 @@
(if (get-buffer-process output-buffer)
(user-error "Umm, there was a merge that didn't complete. Debug?")
(when (not (zerop (shell-command (format "git merge --ff-only %s" b) output-buffer)))
(pop-to-buffer output-buffer)
(user-error "Uh oh, one of the merges resulted in an error!")))))
(when (not my/puppet-p)
(pop-to-buffer output-buffer))
(message "Merging to branch '%s' in repo '%s' failed" b dir)))))
(magit-push-current-to-pushremote nil)))
(load "userlock")