Skip to content

revert change to ignore_skip_worktree in git checkout and git restore #674

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

Merged
merged 1 commit into from
Jul 12, 2024
Merged

revert change to ignore_skip_worktree in git checkout and git restore #674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions builtin/checkout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#define USE_THE_INDEX_VARIABLE
#include "builtin.h"
#include "gvfs.h"
#include "advice.h"
#include "branch.h"
#include "cache-tree.h"
Expand Down Expand Up @@ -1759,7 +1758,6 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
}

opts->track = BRANCH_TRACK_UNSPECIFIED;
opts->ignore_skipworktree = gvfs_config_is_set(GVFS_USE_VIRTUAL_FILESYSTEM);

if (!opts->accept_pathspec && !opts->accept_ref)
BUG("make up your mind, you need to take _something_");
Expand Down