mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

* admin/gitmerge.el (gitmerge-missing):

Browse Source 
Don't get confused by decorations.
This commit is contained in:
Glenn Morris 2017-12-12 23:20:15 -05:00
parent 14b9558752
commit a93c8e36f0
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/gitmerge.el
View File

@ -203,6 +203,7 @@ if and why this commit should be skipped."
;; `gitmerge-skip-regexp' or are marked by --cherry-mark.
(with-temp-buffer
(call-process "git" nil t nil "log" "--cherry-mark" "--left-only"
"--no-decorate"
(concat from "..." (car (vc-git-branches))))
(goto-char (point-max))
(while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t)