git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Bug report: `git restore --source --staged` deals poorly with sparse-checkout

From
Glen Choo <chooglen@google.com>
Date
Oct 3, 2022, 22:05 UTC
Message-ID
<kl6l35c4mukf.fsf@chooglen-macbookpro.roam.corp.google.com>

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: Victoria Dye
Message 1 of 12 in “Bug report: `git restore --source --staged` deals poorly with sparse-checkout”
  1. Glen ChooOct 3, 2022
  2. Victoria DyeOct 4, 2022
  3. Victoria DyeOct 4, 2022
  4. Martin von ZweigbergkOct 5, 2022
  5. Elijah NewrenOct 5, 2022
  6. Martin von ZweigbergkOct 5, 2022
  7. Elijah NewrenOct 6, 2022
  8. Victoria DyeOct 5, 2022
  9. Elijah NewrenOct 5, 2022
  10. Junio C HamanoOct 6, 2022
  11. Junio C HamanoOct 6, 2022
  12. Elijah NewrenOct 5, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.