From: "Torsten Bögershausen" <tboegi@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, random_n0body@icloud.com,
evraiphilippeblain@gmail.com,
Philippe Blain <levraiphilippeblain@gmail.com>
Subject: Re: [PATCH/RFC v1 1/1] git restore -p . and precomposed unicode
Date: Mon, 25 Jan 2021 17:53:08 +0100 [thread overview]
Message-ID: <20210125165307.2qkmbtixzih532ay@tb-raspi4> (raw)
In-Reply-To: <xmqqsg6qyuyi.fsf@gitster.c.googlers.com>
On Sun, Jan 24, 2021 at 11:51:33AM -0800, Junio C Hamano wrote:
Thanks for the fast review, much appreciated.
The short answer: There is more to be done, V2 is coming somewhen.
For the longer story, please see inline.
> tboegi@web.de writes:
>
> > The solution is to read the config variable "core.precomposeunicode" early.
>
> For a single command like "restore", we need to fail if it is run
> outside a repository anyway, so it is OK, but code in "git.c" in
> general can be called outside a repository, we may not know where
> our configuration files are, though. So I'd prefer to avoid
> adding too many "do this thing early for every single command".
>
> Where do we normally read that variable? I see calls to
> precompose_argv() on only a few codepaths
>
> builtin/diff-files.c:38: precompose_argv(argc, argv);
> builtin/diff-index.c:28: precompose_argv(argc, argv);
> builtin/diff-tree.c:129: precompose_argv(argc, argv);
> builtin/diff.c:455: precompose_argv(argc, argv);
> builtin/submodule--helper.c:1260: precompose_argv(diff_args.nr, diff_args.v);
> parse-options.c:872: precompose_argv(argc, argv);
>
> I guess the reason we can get away with it is because most of the
> newer commands use the parse_options() API, and the call to
> precompose_argv() is used by the codepaths implementing these
> commands. And as a rule, these commands read config first before
> calling parse_options(), so by the time the control reaches there,
> the value of the variable may be already known.
Yes.
>
> The question is why "restore -p" is so special? Or does this patch
> mean everybody, even the ones that use parse_options() is broken?
One special thing is that it uses pathspec, `git restore -p .`
and $CWD is inside a decomposed directory.
There is more work to be done, as it seems.
Running `git status . ` in an ASCII based repo (ignore the debug prints)
user@mac:/tmp/210125-precomp/A.dir> git status .
git.c/handle_builtin:699 cmd="status" len=6
git.c:428 prefix="A.dir/" (6)
git.c:434 prec_pfx="(null)" (4294967295)
builtin/commit.c:1401 prefix="A.dir/" (6)
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: O.file
-------------------------
But doing the same test within a decomosed directory:
user@mac:/tmp/210125-decomp/Ä.dir> git status .
git.c/handle_builtin:699 cmd="status" len=6
git.c:428 prefix="Ä.dir/" (8)
git.c:434 prec_pfx="Ä.dir/" (7)
builtin/commit.c:1401 prefix="Ä.dir/" (7)
On branch master
nothing to commit, working tree clean
---------
But using ".." as the pathspec works:
user@mac:/tmp/210125-decomp/Ä.dir> git status ..
git.c/handle_builtin:699 cmd="status" len=6
git.c:428 prefix="Ä.dir/" (8)
git.c:434 prec_pfx="Ä.dir/" (7)
builtin/commit.c:1401 prefix="Ä.dir/" (7)
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: "../A\314\210.dir/\303\226.file"
no changes added to commit (use "git add" and/or "git commit -a")
--------------
So in that sense, it seems as if `git restore` is special because
the patch helps.
More patches are needed asseen above.
And the rest of the suggestions makes all sense.
next prev parent reply other threads:[~2021-01-26 20:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 11:35 git-bugreport-2021-01-06-1209.txt (git can't deal with special characters) Daniel Troger
2021-01-06 14:21 ` Torsten Bögershausen
2021-01-06 16:49 ` Daniel Troger
2021-01-06 21:47 ` Torsten Bögershausen
2021-01-06 22:21 ` Daniel Troger
2021-01-06 23:07 ` Randall S. Becker
2021-01-07 14:34 ` Philippe Blain
2021-01-07 15:49 ` Torsten Bögershausen
2021-01-07 16:21 ` Philippe Blain
2021-01-08 19:07 ` Torsten Bögershausen
2021-01-24 15:13 ` [PATCH/RFC v1 1/1] git restore -p . and precomposed unicode tboegi
2021-01-24 19:51 ` Junio C Hamano
2021-01-25 16:53 ` Torsten Bögershausen [this message]
2021-01-29 17:15 ` [PATCH v2 1/1] MacOS: precompose_argv_prefix() tboegi
2021-01-29 23:19 ` Junio C Hamano
2021-01-31 0:43 ` Junio C Hamano
2021-02-02 15:11 ` [PATCH v3 " tboegi
2021-02-02 17:43 ` Junio C Hamano
2021-02-03 16:28 ` [PATCH v4 " tboegi
2021-02-03 19:33 ` Junio C Hamano
2021-02-03 22:13 ` Junio C Hamano
2021-02-05 17:31 ` Torsten Bögershausen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210125165307.2qkmbtixzih532ay@tb-raspi4 \
--to=tboegi@web.de \
--cc=evraiphilippeblain@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=levraiphilippeblain@gmail.com \
--cc=random_n0body@icloud.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.
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 NNTP newsgroup(s).