From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:48 +0000 (-0700)
Subject: Merge branch 'mk/merge-in-sparse-checkout'
X-Git-Tag: v2.19.0-rc0~124
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/284b4449323778b4d92786969e0f922b9bfd8bdf?ds=inline;hp=-c

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
---

284b4449323778b4d92786969e0f922b9bfd8bdf
diff --combined unpack-trees.c
index 66741130ae,eb544ee1b3..cd0680f11e
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -16,7 -16,6 +16,7 @@@
  #include "submodule.h"
  #include "submodule-config.h"
  #include "fsmonitor.h"
 +#include "object-store.h"
  #include "fetch-object.h"
  
  /*
@@@ -1247,7 -1246,7 +1247,7 @@@ static void mark_new_skip_worktree(stru
  		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;