From: Dmitry Gutov <dgutov@yandex.ru>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: Noam Postavsky <npostavs@gmail.com>,
39452@debbugs.gnu.org, Wolfgang.Scherer@gmx.de
Subject: bug#39452: [PATCH] vc-git-state fails for filenames with wildcards
Date: Sat, 14 Aug 2021 03:11:56 +0300 [thread overview]
Message-ID: <6e6060f9-0259-9b12-f925-a1a85c6757c4@yandex.ru> (raw)
In-Reply-To: <87k0lildtq.fsf@gnus.org>
On 22.07.2021 15:42, Lars Ingebrigtsen wrote:
> Nobody had any opinions, and the "if it's good enough for Magit"
> argument is a good one. So I went ahead and applied Dmitry's patch to
> Emacs 28, and we'll see whether there's any push back on that...
As luck would have it, I have a bit of code (namely
project--vc-list-files) that got broken with that change.
Because, when EXTRA-IGNORES are present, it constructs some non-literal
pathspecs, which naturally fail (get misinterpreted) with
GIT_LITERAL_PATHSPECS=1.
So we need an escape hatch to turn off this feature, which could take
form of a dynamic variable, like in the patch below.
Or we could revert to the other approach. What do people think?
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 714edeba5f..824ea55e7b 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -523,6 +523,7 @@ project--vc-list-files
(`Git
(let ((default-directory (expand-file-name
(file-name-as-directory dir)))
(args '("-z"))
+ vc-git-use-literal-pathspecs
files)
;; Include unregistered.
(setq args (append args
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 143087122f..1082e724ff 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -220,6 +220,9 @@ vc-git-revision-complete-only-branches
:type 'boolean
:version "28.1")
+(defvar vc-git-use-literal-pathspecs t
+ "Non-nil to interpret all Git pathspecs literally.")
+
;; History of Git commands.
(defvar vc-git-history nil)
@@ -1772,7 +1775,8 @@ vc-git-command
(process-environment
(append
`("GIT_DIR"
- "GIT_LITERAL_PATHSPECS=1"
+ ,@(when vc-git-use-literal-pathspecs
+ '("GIT_LITERAL_PATHSPECS=1"))
;; Avoid repository locking during background operations
;; (bug#21559).
,@(when revert-buffer-in-progress-p
@@ -1807,8 +1811,9 @@ vc-git--call
(process-environment
(append
`("GIT_DIR"
- "GIT_LITERAL_PATHSPECS=1"
- ;; Avoid repository locking during background operations
+ ,@(when vc-git-use-literal-pathspecs
+ '("GIT_LITERAL_PATHSPECS=1"))
+ ;; Avoid repository locking during background operations
;; (bug#21559).
,@(when revert-buffer-in-progress-p
'("GIT_OPTIONAL_LOCKS=0")))
next prev parent reply other threads:[~2021-08-14 0:11 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 13:59 bug#39452: [PATCH] vc-git-state fails for filenames with wildcards Wolfgang Scherer
2020-02-06 23:00 ` Dmitry Gutov
2020-02-07 7:57 ` Eli Zaretskii
2020-02-07 8:43 ` Dmitry Gutov
2020-02-07 9:26 ` Eli Zaretskii
2020-02-07 11:43 ` Dmitry Gutov
2020-02-07 14:43 ` Noam Postavsky
2020-02-11 23:01 ` Dmitry Gutov
2020-02-12 15:24 ` Noam Postavsky
2021-05-12 16:04 ` Lars Ingebrigtsen
2021-05-17 1:05 ` Dmitry Gutov
2021-07-22 12:42 ` Lars Ingebrigtsen
2021-08-14 0:11 ` Dmitry Gutov [this message]
2021-08-14 11:56 ` Lars Ingebrigtsen
2021-08-15 1:25 ` Dmitry Gutov
2021-08-27 6:05 ` Juri Linkov
2021-08-27 12:51 ` Dmitry Gutov
2021-08-27 17:10 ` Juri Linkov
2021-08-27 19:57 ` Stephen Berman
2021-08-28 15:07 ` Lars Ingebrigtsen
2021-08-28 15:44 ` Stephen Berman
2021-08-28 15:48 ` Lars Ingebrigtsen
2021-08-28 16:02 ` Stephen Berman
2021-08-28 22:19 ` Dmitry Gutov
2021-08-30 2:36 ` Dmitry Gutov
2021-08-30 13:34 ` Stephen Berman
2021-08-30 23:48 ` Dmitry Gutov
2021-08-27 22:47 ` Dmitry Gutov
2021-08-29 0:18 ` Dmitry Gutov
2021-08-29 16:44 ` Juri Linkov
2021-08-29 19:50 ` Dmitry Gutov
2021-08-29 19:57 ` Lars Ingebrigtsen
2021-08-29 20:11 ` Dmitry Gutov
2020-02-13 18:34 ` Wolfgang Scherer
2020-02-13 23:23 ` Dmitry Gutov
2020-02-14 9:37 ` Eli Zaretskii
2020-02-14 13:59 ` Dmitry Gutov
2020-02-14 14:14 ` Eli Zaretskii
2020-02-14 14:40 ` Dmitry Gutov
2020-02-14 15:45 ` Eli Zaretskii
2020-02-14 20:37 ` Dmitry Gutov
2020-09-20 9:54 ` Lars Ingebrigtsen
2020-02-07 17:25 ` Wolfgang Scherer
2020-02-07 22:31 ` Wolfgang Scherer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e6060f9-0259-9b12-f925-a1a85c6757c4@yandex.ru \
--to=dgutov@yandex.ru \
--cc=39452@debbugs.gnu.org \
--cc=Wolfgang.Scherer@gmx.de \
--cc=larsi@gnus.org \
--cc=npostavs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).