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

Don't get confused by decorations.

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 13d92ac92bcef894a810bd661737c41c89b11210..5e7d8c3e33fd977a7423e27567afe19ebce98938 100644 (file)
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -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)