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>

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 24926db27a7b18738a3ee473eb499bf133295873..77481df5d6b53bc88b1a36a9461baab53026fe2d 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -979,6 +979,8 @@ static void add_pbase_object(struct tree_desc *tree,
        int cmp;
 
        while (tree_entry(tree,&entry)) {
+               if (S_ISGITLINK(entry.mode))
+                       continue;
                cmp = tree_entry_len(entry.path, entry.sha1) != cmplen ? 1 :
                      memcmp(name, entry.path, cmplen);
                if (cmp > 0)

diff --git a/t/t3050-subprojects-fetch.sh b/t/t3050-subprojects-fetch.sh
new file mode 100755 (executable)
index 0000000..34f26a8
--- /dev/null
+++ b/t/t3050-subprojects-fetch.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+test_description='fetching and pushing project with subproject'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+       test_tick &&
+       mkdir -p sub && (
+               cd sub &&
+               git init &&
+               >subfile &&
+               git add subfile
+               git commit -m "subproject commit #1"
+       ) &&
+       >mainfile
+       git add sub mainfile &&
+       test_tick &&
+       git commit -m "superproject commit #1"
+'
+
+test_expect_success clone '
+       git clone file://`pwd`/.git cloned &&
+       (git rev-parse HEAD; git ls-files -s) >expected &&
+       (
+               cd cloned &&
+               (git rev-parse HEAD; git ls-files -s) >../actual
+       ) &&
+       diff -u expected actual
+'
+
+test_expect_success advance '
+       echo more >mainfile &&
+       git update-index --force-remove sub &&
+       mv sub/.git sub/.git-disabled &&
+       git add sub/subfile mainfile &&
+       mv sub/.git-disabled sub/.git &&
+       test_tick &&
+       git commit -m "superproject commit #2"
+'
+
+test_expect_success fetch '
+       (git rev-parse HEAD; git ls-files -s) >expected &&
+       (
+               cd cloned &&
+               git pull &&
+               (git rev-parse HEAD; git ls-files -s) >../actual
+       ) &&
+       diff -u expected actual
+'
+
+test_done