diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-24 21:50:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 21:50:48 (GMT) |
| commit | 284b4449323778b4d92786969e0f922b9bfd8bdf (patch) | |
| tree | 2044e74849a06ddd220cc7310295aeaf55a8bc0c /unpack-trees.c | |
| parent | 6fc7de1a1f0cca63899e67cc8e96fbdb3be73019 (diff) | |
| parent | b33fdfc34cda95f92cc7a50e5c81b87f8ee65eef (diff) | |
| download | git-284b4449323778b4d92786969e0f922b9bfd8bdf.zip git-284b4449323778b4d92786969e0f922b9bfd8bdf.tar.gz git-284b4449323778b4d92786969e0f922b9bfd8bdf.tar.bz2 | |
Merge branch 'mk/merge-in-sparse-checkout'
"git reset --merge" (hence "git merge ---abort") and "git reset --hard"
had trouble working correctly in a sparsely checked out working
tree after a conflict, which has been corrected.
* mk/merge-in-sparse-checkout:
unpack-trees: do not fail reset because of unmerged skipped entry
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 6674113..cd0680f 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1247,7 +1247,7 @@ static void mark_new_skip_worktree(struct exclude_list *el, if (select_flag && !(ce->ce_flags & select_flag)) continue; - if (!ce_stage(ce)) + if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED)) ce->ce_flags |= skip_wt_flag; else ce->ce_flags &= ~skip_wt_flag; |