Fix rev-list when showing objects involving submodules
The function mark_tree_uninteresting() assumed that the tree entries are blob when they are not trees. This is not so. Since we do not traverse into submodules (yet), the gitlinks should be ignored. In general, we should try to start moving away from using the "S_ISLNK()" like things for internal git state. It was a mistake to just assume the numbers all were same across all systems in the first place. This implementation converts to the "object_type", and then uses a case statement. Noticed by Ilari on IRC. Test script taken from an earlier version by Dscho. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
fb5fd01148
commit
4d1012c370
@ -990,7 +990,7 @@ static void add_pbase_object(struct tree_desc *tree,
|
||||
return;
|
||||
if (name[cmplen] != '/') {
|
||||
add_object_entry(entry.sha1,
|
||||
S_ISDIR(entry.mode) ? OBJ_TREE : OBJ_BLOB,
|
||||
object_type(entry.mode),
|
||||
fullname, 1);
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user