Skip to content

Set updated_skipworktree on restore --staged #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Set updated_skipworktree on restore --staged #794

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bd326c
Set updated_skipworktree on restore --staged
Sep 3, 2025
e83dd5e
WIP
Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion builtin/checkout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,13 @@ static void mark_ce_for_checkout_no_overlay(struct cache_entry *ce,
const struct checkout_opts *opts)
{
ce->ce_flags &= ~CE_MATCHED;
if (!opts->ignore_skipworktree && ce_skip_worktree(ce))
if (!opts->ignore_skipworktree &&
/* `restore --staged` after `cherry-pick -n` or `reset --soft`
* may have new files added to the index but with skip_worktree
* set if using virtual file system
*/
!(core_virtualfilesystem && opts->checkout_index)
&& ce_skip_worktree(ce))
return;
if (ce_path_match(the_repository->index, ce, &opts->pathspec, ps_matched)) {
ce->ce_flags |= CE_MATCHED;
Expand Down Expand Up @@ -641,6 +647,19 @@ static int checkout_paths(const struct checkout_opts *opts,
checkout_index = opts->checkout_index;

if (checkout_index) {
if (opts->checkout_index && core_virtualfilesystem) {
/* Some `restore --staged` scenarios may update
* skipworktree bits, such as after `cherry-pick -n` or
* `reset --soft`
*/
the_repository->index->updated_skipworktree = 1;
/* In same scenarios, if there were files added during
* the previous operation they may not have been added
* to the projection when added to the worktree, but
* they need to be added now.
*/
the_repository->index->updated_workdir = 1;
}
if (write_locked_index(the_repository->index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
} else {
Expand Down
Loading