mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 20:50:52 -08:00
Code Issues Projects Releases Wiki Activity

gitmerge: Try to detect cherry-picks

Browse source 
* admin/gitmerge.el (gitmerge-default-branch): Change to
origin/emacs-25.
(gitmerge-missing): Use symmetric difference ('...') between
branch and master so that cherry-picks can be detected.
This commit is contained in:
David Engster 2015-11-14 17:53:10 +01:00
parent 5f7a2a9053
commit 2ac79ae901
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/gitmerge.el
View file

@ -65,7 +65,7 @@ Auto-commit"
'((t (:strike-through t))) '((t (:strike-through t)))
"Face for skipped commits.") "Face for skipped commits.")
(defconst gitmerge-default-branch "origin/emacs-24" (defconst gitmerge-default-branch "origin/emacs-25"
"Default for branch that should be merged.") "Default for branch that should be merged.")
(defconst gitmerge-buffer "*gitmerge*" (defconst gitmerge-buffer "*gitmerge*"
@ -183,8 +183,8 @@ if and why this commit should be skipped."
;; Go through the log and remember all commits that match ;; Go through the log and remember all commits that match
;; `gitmerge-skip-regexp' or are marked by --cherry-mark. ;; `gitmerge-skip-regexp' or are marked by --cherry-mark.
(with-temp-buffer (with-temp-buffer
(call-process "git" nil t nil "log" "--cherry-mark" from (call-process "git" nil t nil "log" "--cherry-mark"
(concat "^" (car (vc-git-branches)))) (concat from "..." (car (vc-git-branches))))
(goto-char (point-max)) (goto-char (point-max))
(while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t) (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t)
(let ((cherrymark (match-string 1)) (let ((cherrymark (match-string 1))