Re: Possible bug with git restore
- From
René Scharfe <l.s.r@web.de>
- Date
- Aug 20, 2020, 17:48 UTC
- Message-ID
- <c3f0d51a-d0e3-ed0a-c9ed-da092704da5c@web.de>
- In-Reply-To
- <20200820134013.GA2526241@coredump.intra.peff.net>
Am 20.08.20 um 15:40 schrieb Jeff King:
> On Thu, Aug 20, 2020 at 03:59:00PM +0300, Sergii Shkarnikov wrote: > >> Here is a script to reproduce the issue that works for me in Git Bash:
That's very helpful!
> - shouldn't that wildcard pathspec match those files? I've confirmed > that the glob characters make it into Git's pathspec machinery, and > since it doesn't have slashes, I think we'd match a basename (and > certainly "git ls-files *test_file.*" does what I expect).
No, because restore doesn't interpret pathspecs recursively. I don't know why that causes files to disappear, though. But here's a fix.
No sign-off because I don't understand why pathspec recursiveness is a thing that can be turned off -- I'd expect pathspec syntax to be consistent for all commands. So there might be a good reason why it was not enabled for restore (and switch and checkout).
The flag was introduced in bc96cc87dbb (tree_entry_interesting(): support depth limit, 2010-12-15), but I still don't fully get it. Anyway, here's what I got -- feel free to incorporate it in a real patch:
René
--- builtin/checkout.c | 4 ++++ t/t2072-restore-pathspec-file.sh | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c index 28371954912..8d2dc0cfa48 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -66,6 +66,7 @@ struct checkout_opts { int can_switch_when_in_progress; int orphan_from_empty_tree; int empty_pathspec_ok; + int recursive_pathspec; int checkout_index; int checkout_worktree; const char *ignore_unmerged_opt; @@ -1707,6 +1708,8 @@ static int checkout_main(int argc, const char **argv, const char *prefix, die(_("--pathspec-file-nul requires --pathspec-from-file")); } + opts->pathspec.recursive = opts->recursive_pathspec; + if (opts->pathspec.nr) { if (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge) die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n" @@ -1852,6 +1855,7 @@ int cmd_restore(int argc, const char **argv, const char *prefix) opts.checkout_index = -1; /* default off */ opts.checkout_worktree = -2; /* default on */ opts.ignore_unmerged_opt = "--ignore-unmerged"; + opts.recursive_pathspec = 1; options = parse_options_dup(restore_options); options = add_common_options(&opts, options); diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh index 0d47946e8a9..da976665095 100755 --- a/t/t2072-restore-pathspec-file.sh +++ b/t/t2072-restore-pathspec-file.sh @@ -9,18 +9,21 @@ test_tick test_expect_success setup ' test_commit file0 && + mkdir dir1 && + echo 1 >dir1/file && echo 1 >fileA.t && echo 1 >fileB.t && echo 1 >fileC.t && echo 1 >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && + git add dir1 fileA.t fileB.t fileC.t fileD.t && git commit -m "files 1" && + echo 2 >dir1/file && echo 2 >fileA.t && echo 2 >fileB.t && echo 2 >fileC.t && echo 2 >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && + git add dir1 fileA.t fileB.t fileC.t fileD.t && git commit -m "files 2" && git tag checkpoint @@ -31,7 +34,7 @@ restore_checkpoint () { } verify_expect () { - git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual && + git status --porcelain --untracked-files=no -- dir1 fileA.t fileB.t fileC.t fileD.t >actual && test_cmp expect actual } @@ -161,4 +164,14 @@ test_expect_success 'error conditions' ' test_i18ngrep -e "you must specify path(s) to restore" err ' +test_expect_success 'pathspec matches file in subdirectory' ' + restore_checkpoint && + + echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 && + cat >expect <<-\EOF && + M dir1/file + EOF + verify_expect +' + test_done -- 2.28.0