From: Glen Choo <chooglen@google.com>
To: git@vger.kernel.org, vdye@github.com,
Derrick Stolee <derrickstolee@github.com>
Cc: martinvonz@google.com
Subject: Bug report: `git restore --source --staged` deals poorly with sparse-checkout
Date: Mon, 03 Oct 2022 15:05:52 -0700 [thread overview]
Message-ID: <kl6l35c4mukf.fsf@chooglen-macbookpro.roam.corp.google.com> (raw)
Filing a `git bugreport` on behalf of a user at $DAYJOB. I'm also pretty
surprised by this behavior, perhaps someone who knows more could shed
some light?
What did you do before the bug happened? (Steps to reproduce your issue)
git clone git@github.com:git/git.git . &&
git sparse-checkout set t &&
git restore --source v2.38.0-rc1 --staged Documentation &&
git status
What did you expect to happen? (Expected behavior)
I expected to see staged changes only, since I restored only paths
outside of my sparse spec (which was t/, plus the implicit root
directory).
What happened instead? (Actual behavior)
I saw a staged modification (Documentation/cmd-list.perl) and the same
file reported as deleted in the working copy. Specifically,
$ git status
On branch master
Your branch is up to date with 'origin/master'.
You are in a sparse checkout with 64% of tracked files present.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: Documentation/cmd-list.perl
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: Documentation/cmd-list.perl
What's different between what you expected and what actually happened?
git status should not have said that the file was deleted in the
working copy
[System Info]
git version: git version 2.37.3.998.g577e59143f-goog
cpu: x86_64 no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Linux 5.17.11-1rodete2-amd64 #1 SMP PREEMPT Debian
5.17.11-1rodete2 (2022-06-09) x86_64
compiler info: gnuc: 12.2
libc info: glibc: 2.33
$SHELL (typically, interactive shell): /bin/bash
next reply other threads:[~2022-10-03 22:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 22:05 Glen Choo [this message]
2022-10-04 16:34 ` Bug report: `git restore --source --staged` deals poorly with sparse-checkout Victoria Dye
[not found] ` <CAESOdVAh68HoQoyicfZn4XbjGfiRFCu1zFQmUjMcSAg3tUzr4Q@mail.gmail.com>
2022-10-04 20:34 ` Victoria Dye
2022-10-05 4:53 ` Martin von Zweigbergk
2022-10-05 7:51 ` Elijah Newren
2022-10-05 20:00 ` Martin von Zweigbergk
2022-10-06 4:20 ` Elijah Newren
2022-10-05 16:11 ` Victoria Dye
2022-10-05 5:22 ` Elijah Newren
2022-10-06 19:30 ` Junio C Hamano
2022-10-06 19:38 ` Junio C Hamano
2022-10-05 5:00 ` Elijah Newren
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=kl6l35c4mukf.fsf@chooglen-macbookpro.roam.corp.google.com \
--to=chooglen@google.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=martinvonz@google.com \
--cc=vdye@github.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://80x24.org/mirrors/git.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).