[Emacs-diffs] master dcd5877: gitmerge: Fix git log command

[David Engster]

branch: master
commit dcd5877a76557f4ce08bebee0d8919ad951a9f13
Author: David Engster <address@hidden>
Commit: David Engster <address@hidden>

    gitmerge: Fix git log command
    
    * admin/gitmerge.el (gitmerge-missing): Use '--left-only' since we
    only want commits from the branch that is to be merged.
    (gitmerge-setup-log-buffer): Use the same symmetric range as in
    `gitmerge-missing'.
---
 admin/gitmerge.el |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 4197ac3..1e92c8c 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -183,7 +183,7 @@ if and why this commit should be skipped."
     ;; Go through the log and remember all commits that match
     ;; `gitmerge-skip-regexp' or are marked by --cherry-mark.
     (with-temp-buffer
-      (call-process "git" nil t nil "log" "--cherry-mark"
+      (call-process "git" nil t nil "log" "--cherry-mark" "--left-only"
                    (concat from "..." (car (vc-git-branches))))
       (goto-char (point-max))
       (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t)
@@ -206,9 +206,9 @@ if and why this commit should be skipped."
   "Create the buffer for choosing commits."
   (with-current-buffer (get-buffer-create gitmerge-buffer)
     (erase-buffer)
-    (call-process "git" nil t nil "log"
+    (call-process "git" nil t nil "log" "--left-only"
                  "--pretty=format:%h %<(20,trunc) %an: %<(100,trunc) %s"
-                 from (concat "^" (car (vc-git-branches))))
+                 (concat from "..." (car (vc-git-branches))))
     (goto-char (point-min))
     (while (looking-at "^\\([a-f0-9]+\\)")
       (let ((skipreason (gitmerge-skip-commit-p (match-string 1) commits)))