diff options
| author | Glenn Morris | 2017-12-12 23:20:15 -0500 |
|---|---|---|
| committer | Glenn Morris | 2017-12-12 23:20:15 -0500 |
| commit | a93c8e36f0e17b4f209cd943e581f0141789450f (patch) | |
| tree | 40e8bd0d5681918b32c9cef90b10d5b81955b6ef /admin | |
| parent | 14b95587520959c5b54356547a0a69932a9bb480 (diff) | |
| download | emacs-a93c8e36f0e17b4f209cd943e581f0141789450f.tar.gz emacs-a93c8e36f0e17b4f209cd943e581f0141789450f.zip | |
* admin/gitmerge.el (gitmerge-missing):
Don't get confused by decorations.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 13d92ac92bc..5e7d8c3e33f 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -203,6 +203,7 @@ if and why this commit should be skipped." | |||
| 203 | ;; `gitmerge-skip-regexp' or are marked by --cherry-mark. | 203 | ;; `gitmerge-skip-regexp' or are marked by --cherry-mark. |
| 204 | (with-temp-buffer | 204 | (with-temp-buffer |
| 205 | (call-process "git" nil t nil "log" "--cherry-mark" "--left-only" | 205 | (call-process "git" nil t nil "log" "--cherry-mark" "--left-only" |
| 206 | "--no-decorate" | ||
| 206 | (concat from "..." (car (vc-git-branches)))) | 207 | (concat from "..." (car (vc-git-branches)))) |
| 207 | (goto-char (point-max)) | 208 | (goto-char (point-max)) |
| 208 | (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t) | 209 | (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t) |