From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 1 Dec 2014 18:15:28 +0000 (-0500)
Subject: * lisp/vc: Fix use of find-conflicted-file in Git.
X-Git-Tag: emacs-25.0.90~2635^2~243
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b34578dd880e788a68bb7bbd12fd848ba461226a;p=emacs.git

* lisp/vc: Fix use of find-conflicted-file in Git.

* lisp/vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the
current "project" rather than just the current directory.
* lisp/vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory
the file names make sense.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec95af9441f..481bd150502 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2014-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the
+	current "project" rather than just the current directory.
+	* vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory
+	the file names make sense.
+
 	* vc/smerge-mode.el (smerge-swap): New command.
 
 	* vc/diff-mode.el (diff-kill-applied-hunks): New command.
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 805e48831ef..53db340146f 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -777,7 +777,7 @@ This prompts for a branch to merge from."
           ;; See git-status(1).
           (when (member state '("AU" "UD" "UA" ;; "DD"
                                 "DU" "AA" "UU"))
-            (push file files)))))))
+            (push (expand-file-name file directory) files)))))))
 
 (defun vc-git-resolve-when-done ()
   "Call \"git add\" if the conflict markers have been removed."
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b6ba2d3e863..d3315ca08b3 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2101,8 +2101,9 @@ changes from the current branch."
   (let* ((backend (or (if buffer-file-name (vc-backend buffer-file-name))
                       (vc-responsible-backend default-directory)
                       (error "No VC backend")))
+         (root (vc-root-dir))
          (files (vc-call-backend backend
-                                 'conflicted-files default-directory)))
+                                 'conflicted-files (or root default-directory))))
     ;; Don't try and visit the current file.
     (if (equal (car files) buffer-file-name) (pop files))
     (if (null files)