[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 3c2624e 1/2: project--vc-list-files: Don't list conflicted files
From: |
Dmitry Gutov |
Subject: |
master 3c2624e 1/2: project--vc-list-files: Don't list conflicted files thrice |
Date: |
Tue, 19 May 2020 19:07:16 -0400 (EDT) |
branch: master
commit 3c2624e18826d9466eff13524b43903b781ada91
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
project--vc-list-files: Don't list conflicted files thrice
* lisp/progmodes/project.el (project--vc-list-files):
Use delete-consecutive-dups.
---
lisp/progmodes/project.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 4425999..06e882b 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -391,7 +391,9 @@ backend implementation of `project-external-roots'.")
submodules)))
(setq files
(apply #'nconc files sub-files)))
- files))
+ ;; 'git ls-files' returns duplicate entries for merge conflicts.
+ ;; XXX: Better solutions welcome, but this seems cheap enough.
+ (delete-consecutive-dups files)))
(`Hg
(let ((default-directory (expand-file-name (file-name-as-directory dir)))
args)