[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a93c8e3: * admin/gitmerge.el (gitmerge-missing):
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master a93c8e3: * admin/gitmerge.el (gitmerge-missing): |
Date: |
Tue, 12 Dec 2017 23:20:31 -0500 (EST) |
branch: master
commit a93c8e36f0e17b4f209cd943e581f0141789450f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* admin/gitmerge.el (gitmerge-missing):
Don't get confused by decorations.
---
admin/gitmerge.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 13d92ac..5e7d8c3 100644
--- 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a93c8e3: * admin/gitmerge.el (gitmerge-missing):,
Glenn Morris <=