diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-24 18:03:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-24 18:03:20 -0800 |
| commit | be4b37b9ad22ecc6b4ff5782de8ac0d6d89e2bb7 (patch) | |
| tree | 46002951c1e7c2b36aa1ca49e8bacd6392ebc43e /builtin-pack-objects.c | |
| parent | bc2b8eafaf074492e0489974b4086b3a0f354e7e (diff) | |
| parent | 481f0ee60eef2c34b891e5d04b7e6e5a955eedf4 (diff) | |
| download | git-be4b37b9ad22ecc6b4ff5782de8ac0d6d89e2bb7.tar.xz | |
Merge branch 'lt/maint-rev-list-gitlink' into maint
* lt/maint-rev-list-gitlink:
Fix rev-list when showing objects involving submodules
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 12509faa77..228040486e 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -989,7 +989,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; } |