mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-14 23:40:39 -08:00
Revert "vc-git-project-list-files: Restore support for Git < 2.13"
This reverts commit 821c0d36df.
Despite re-enacting what the modern Git versions seem to do under the
covers, the effect is not the same: filtering works differently.
This commit is contained in:
parent
75a1403ff3
commit
de5b8c70fb
1 changed files with 24 additions and 25 deletions
|
|
@ -723,31 +723,30 @@ See `project-vc-extra-root-markers' for the marker value format.")
|
|||
(and include-untracked '("-o"))))
|
||||
(when extra-ignores
|
||||
(setq args (append args
|
||||
;; Git <2.13 needs a positive pathspec first.
|
||||
'("--" ".")
|
||||
(mapcar
|
||||
(lambda (i)
|
||||
(format
|
||||
":(exclude,glob,top)%s"
|
||||
(if (string-match "\\*\\*" i)
|
||||
;; Looks like pathspec glob
|
||||
;; format already.
|
||||
i
|
||||
(if (string-match "\\./" i)
|
||||
;; ./abc -> abc
|
||||
(setq i (substring i 2))
|
||||
;; abc -> **/abc
|
||||
(setq i (concat "**/" i))
|
||||
;; FIXME: '**/abc' should also
|
||||
;; match a directory with that
|
||||
;; name, but doesn't (git 2.25.1).
|
||||
;; Maybe we should replace
|
||||
;; such entries with two.
|
||||
(if (string-match "/\\'" i)
|
||||
;; abc/ -> abc/**
|
||||
(setq i (concat i "**"))))
|
||||
i)))
|
||||
extra-ignores))))
|
||||
(cons "--"
|
||||
(mapcar
|
||||
(lambda (i)
|
||||
(format
|
||||
":(exclude,glob,top)%s"
|
||||
(if (string-match "\\*\\*" i)
|
||||
;; Looks like pathspec glob
|
||||
;; format already.
|
||||
i
|
||||
(if (string-match "\\./" i)
|
||||
;; ./abc -> abc
|
||||
(setq i (substring i 2))
|
||||
;; abc -> **/abc
|
||||
(setq i (concat "**/" i))
|
||||
;; FIXME: '**/abc' should also
|
||||
;; match a directory with that
|
||||
;; name, but doesn't (git 2.25.1).
|
||||
;; Maybe we should replace
|
||||
;; such entries with two.
|
||||
(if (string-match "/\\'" i)
|
||||
;; abc/ -> abc/**
|
||||
(setq i (concat i "**"))))
|
||||
i)))
|
||||
extra-ignores)))))
|
||||
(setq files
|
||||
(delq nil
|
||||
(mapcar
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue