diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-07-16 07:06:27 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-07-18 13:45:33 -0700 |
| commit | 6d6a782fbf83927212f348f91823d886c5cd6d85 (patch) | |
| tree | f78051522c92b67cd414291fb6436c3d7893c676 /notes-merge.h | |
| parent | cache-tree.c: fix i-t-a entry skipping directory updates sometimes (diff) | |
| download | tgif-6d6a782fbf83927212f348f91823d886c5cd6d85.tar.xz | |
cache-tree: do not generate empty trees as a result of all i-t-a subentries
If a subdirectory contains nothing but i-t-a entries, we generate an
empty tree object and add it to its parent tree. Which is wrong. Such
a subdirectory should not be added.
Note that this has a cascading effect. If subdir 'a/b/c' contains
nothing but i-t-a entries, we ignore it. But then if 'a/b' contains
only (the non-existing) 'a/b/c', then we should ignore 'a/b' while
building 'a' too. And it goes all the way up to top directory.
Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions