From: Jeff King <peff@peff.net>
To: Sergii Shkarnikov <sergii.shkarnikov@globallogic.com>
Cc: Eric Sunshine <sunshine@sunshineco.com>, Git List <git@vger.kernel.org>
Subject: Re: Possible bug with git restore
Date: Thu, 20 Aug 2020 09:40:13 -0400 [thread overview]
Message-ID: <20200820134013.GA2526241@coredump.intra.peff.net> (raw)
In-Reply-To: <CAFvH=vuFg+kM2GkBaE7jRqHWWcTcZMrs36KLS+-VTy8tgNZXJw@mail.gmail.com>
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:
>
> =============================================
> #!/bin/bash
>
> #create repo with corresponding structure
> mkdir restore_bug_test
> cd restore_bug_test
> mkdir incl
> mkdir src
> touch incl/test_file.hpp
> touch src/test_file.cpp
> git init
> git add .
> git commit -m"initial"
>
> #add a couple of commits
> echo "1" >> incl/test_file.hpp
> echo "1" >> src/test_file.cpp
> git commit -am"1"
> echo "2" >> incl/test_file.hpp
> echo "2" >> src/test_file.cpp
> git commit -am"2"
>
> #reproduce bug
> git restore -s HEAD~ -- *test_file.*
> git status
> ===============================================
That reproduces for me here on Linux, as well (for those just joining,
the interesting thing is that the final "git status" reports the files
as deleted, rather than modified back to "1").
Interestingly, if I do:
git restore -s HEAD~ --overlay -- *test_file.*
then I get:
error: pathspec '*test_file.*' did not match any file(s) known to git
So there are two oddities here:
- 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).
- even if it doesn't match, it seems weird that overlay mode would
remove files that don't match. I'd expect it to remove files in
trees that _did_ match the pathspec, but leave anything outside of
the pathspec untouched.
It's almost like we matched the pathspec in the pass over the
working tree files, but failed to do so when reading in the tree.
-Peff
next prev parent reply other threads:[~2020-08-20 13:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 18:51 Possible bug with git restore Sergii Shkarnikov
2020-08-14 22:41 ` Eric Sunshine
2020-08-20 12:59 ` Sergii Shkarnikov
2020-08-20 13:40 ` Jeff King [this message]
2020-08-20 17:48 ` René Scharfe
2020-08-20 18:27 ` Jeff King
2020-08-22 8:57 ` [PATCH] checkout, restore: make pathspec recursive René Scharfe
2020-08-24 20:21 ` Jeff King
2020-08-22 10:29 ` Possible bug with git restore René Scharfe
2020-08-24 20:25 ` Jeff King
2020-08-22 19:36 ` Junio C Hamano
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=20200820134013.GA2526241@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=sergii.shkarnikov@globallogic.com \
--cc=sunshine@sunshineco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.