diff options
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c index 613623be1..7563e43a3 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2166,6 +2166,12 @@ static void file_change_m(struct branch *b) p = uq.buf; } + /* Git does not track empty, non-toplevel directories. */ + if (S_ISDIR(mode) && !memcmp(sha1, EMPTY_TREE_SHA1_BIN, 20) && *p) { + tree_content_remove(&b->branch_tree, p, NULL); + return; + } + if (S_ISGITLINK(mode)) { if (inline_data) die("Git links cannot be specified 'inline': %s", |