[v3,3/8] entry: support CE_WT_REMOVE flag in checkout_entry
diff mbox series

Message ID 20190108215225.3077-4-t.gummerer@gmail.com
State New
Headers show
  • introduce no-overlay mode in git checkout
Related show

Commit Message

Thomas Gummerer Jan. 8, 2019, 9:52 p.m. UTC
'checkout_entry()' currently only supports creating new entries in the
working tree, but not deleting them.  Add the ability to remove
entries at the same time if the entry is marked with the CE_WT_REMOVE

Currently this doesn't have any effect, as the CE_WT_REMOVE flag is
only used in unpack-tree, however we will make use of this in a
subsequent step in the series.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
 entry.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff mbox series

diff --git a/entry.c b/entry.c
index b9eef57117..3d3701e7ae 100644
--- a/entry.c
+++ b/entry.c
@@ -441,6 +441,17 @@  int checkout_entry(struct cache_entry *ce,
 	static struct strbuf path = STRBUF_INIT;
 	struct stat st;
+	if (ce->ce_flags & CE_WT_REMOVE) {
+		if (topath)
+			/*
+			 * No content and thus no path to create, so we have
+			 * no pathname to return.
+			 */
+			BUG("Can't remove entry to a path");
+		unlink_entry(ce);
+		return 0;
+	}
 	if (topath)
 		return write_entry(ce, topath, state, 1);