| commit | 1211be6bed1146dcef953c7c2ab332ee995f7152 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 17 Aug 2007 16:56:54 +0000 (17 09:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Aug 2007 18:44:47 +0000 (19 11:44 -0700) | ||
| tree | 38e28b3c3a9c93b6fa47b2f53f88171629d23051 | treesnapshot (tar.gz zip) |
| parent | 95064cbcc8a51fb9e3c16350e8c567a84d131ad7 | commitdiff |
Make thin-pack generation subproject aware.
When a thin pack wants to send a tree object at "sub/dir", and
the commit that is common between the sender and the receiver
that is used as the base object has a subproject at that path,
we should not try to use the data at "sub/dir" of the base tree
as a tree object. It is not a tree to begin with, and more
importantly, the commit object there does not have to even
exist.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When a thin pack wants to send a tree object at "sub/dir", and
the commit that is common between the sender and the receiver
that is used as the base object has a subproject at that path,
we should not try to use the data at "sub/dir" of the base tree
as a tree object. It is not a tree to begin with, and more
importantly, the commit object there does not have to even
exist.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-pack-objects.c | diffblobblamehistory | |
| t/t3050-subprojects-fetch.sh | [new file with mode: 0755] | blob |