mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
entry: support CE_WT_REMOVE flag in checkout_entry
'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 flag. 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b702dd12d5
commit
536ec1839d
11
entry.c
11
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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue