diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 17 | ||||
| -rw-r--r-- | src/stash.c | 3 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/checkout.c b/src/checkout.c index 0b385226b..04b2a66b2 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -259,6 +259,17 @@ static int checkout_action_no_wd( return checkout_action_common(action, data, delta, NULL); } +static bool wd_item_is_removable(git_iterator *iter, const git_index_entry *wd) +{ + git_buf *full = NULL; + + if (wd->mode != GIT_FILEMODE_TREE) + return true; + if (git_iterator_current_workdir_path(&full, iter) < 0) + return true; + return !full || !git_path_contains(full, DOT_GIT); +} + static int checkout_action_wd_only( checkout_data *data, git_iterator *workdir, @@ -307,11 +318,13 @@ static int checkout_action_wd_only( /* found in index */; else if (git_iterator_current_is_ignored(workdir)) { notify = GIT_CHECKOUT_NOTIFY_IGNORED; - remove = ((data->strategy & GIT_CHECKOUT_REMOVE_IGNORED) != 0); + remove = ((data->strategy & GIT_CHECKOUT_REMOVE_IGNORED) != 0) && + wd_item_is_removable(workdir, wd); } else { notify = GIT_CHECKOUT_NOTIFY_UNTRACKED; - remove = ((data->strategy & GIT_CHECKOUT_REMOVE_UNTRACKED) != 0); + remove = ((data->strategy & GIT_CHECKOUT_REMOVE_UNTRACKED) != 0) && + wd_item_is_removable(workdir, wd); } error = checkout_notify(data, notify, NULL, wd); diff --git a/src/stash.c b/src/stash.c index d20e29b80..86e0a627c 100644 --- a/src/stash.c +++ b/src/stash.c @@ -178,7 +178,8 @@ static int stash_update_index_from_diff( break; case GIT_DELTA_UNTRACKED: - if (data->include_untracked) + if (data->include_untracked && + delta->new_file.mode != GIT_FILEMODE_TREE) add_path = delta->new_file.path; break; |