commit,shallow: unparse commits if grafts changed

When a commit is parsed, it pretends to have a different (possibly
empty) list of parents if there is graft information for that commit.
But there is a bug that could occur when a commit is parsed, the graft
information is updated (for example, when a shallow file is rewritten),
and the same commit is subsequently used: the parents of the commit do
not conform to the updated graft information, but the information at the
time of parsing.

This is usually not an issue, as a commit is usually introduced into the
repository at the same time as its graft information. That means that
when we try to parse that commit, we already have its graft information.

But it is an issue when fetching a shallow point directly into a
repository with submodules. The function
assign_shallow_commits_to_refs() parses all sought objects (including
the shallow point, which we are directly fetching). In update_shallow()
in fetch-pack.c, assign_shallow_commits_to_refs() is called before
commit_shallow_file(), which means that the shallow point would have
been parsed before graft information is updated. Once a commit is
parsed, it is no longer sensitive to any graft information updates. This
parsed commit is subsequently used when we do a revision walk to search
for submodules to fetch, meaning that the commit is considered to have
parents even though it is a shallow point (and therefore should be
treated as having no parents).

Therefore, whenever graft information is updated, mark the commits that
were previously grafts and the commits that are newly grafts as
unparsed.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit.c b/commit.c
index 59b6c3e45525c5f5c1d19577612364992e245a6d..1537ea73d0448f42b9d787c20abe4f06b527e67b 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -120,6 +120,17 @@ int commit_graft_pos(struct repository *r, const struct object_id *oid)
                       commit_graft_oid_access);
 }
 
+static void unparse_commit(struct repository *r, const struct object_id *oid)
+{
+       struct commit *c = lookup_commit(r, oid);
+
+       if (!c->object.parsed)
+               return;
+       free_commit_list(c->parents);
+       c->parents = NULL;
+       c->object.parsed = 0;
+}
+
 int register_commit_graft(struct repository *r, struct commit_graft *graft,
                          int ignore_dups)
 {
@@ -145,6 +156,7 @@ int register_commit_graft(struct repository *r, struct commit_graft *graft,
                        (r->parsed_objects->grafts_nr - pos - 1) *
                        sizeof(*r->parsed_objects->grafts));
        r->parsed_objects->grafts[pos] = graft;
+       unparse_commit(r, &graft->oid);
        return 0;
 }
 
@@ -253,8 +265,10 @@ void reset_commit_grafts(struct repository *r)
 {
        int i;
 
-       for (i = 0; i < r->parsed_objects->grafts_nr; i++)
+       for (i = 0; i < r->parsed_objects->grafts_nr; i++) {
+               unparse_commit(r, &r->parsed_objects->grafts[i]->oid);
                free(r->parsed_objects->grafts[i]);
+       }
        r->parsed_objects->grafts_nr = 0;
        r->parsed_objects->commit_graft_prepared = 0;
 }

diff --git a/shallow.c b/shallow.c
index 8ad5f22832cabc33217a185650f41a56a18b9bae..cf289a4c6d19436c6c02af78a640a726da4467de 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -97,6 +97,13 @@ int commit_shallow_file(struct repository *r, struct shallow_lock *lk)
 {
        int res = commit_lock_file(&lk->lock);
        reset_repository_shallow(r);
+
+       /*
+        * Update in-memory data structures with the new shallow information,
+        * including unparsing all commits that now have grafts.
+        */
+       is_repository_shallow(r);
+
        return res;
 }
 

diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 92948de7a0083be93284de46dfb90c75cd0e1e2b..10e9a7ff2641897b6a666b1e78eefb81e1c5b7d4 100755 (executable)
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -164,12 +164,24 @@ test_expect_success 'fetch --update-shallow' '
 test_expect_success 'fetch --update-shallow into a repo with submodules' '
        git init a-submodule &&
        test_commit -C a-submodule foo &&
+
+       test_when_finished "rm -rf repo-with-sub" &&
        git init repo-with-sub &&
        git -C repo-with-sub submodule add ../a-submodule a-submodule &&
        git -C repo-with-sub commit -m "added submodule" &&
        git -C repo-with-sub fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/*
 '
 
+test_expect_success 'fetch --update-shallow a commit that is also a shallow point into a repo with submodules' '
+       test_when_finished "rm -rf repo-with-sub" &&
+       git init repo-with-sub &&
+       git -C repo-with-sub submodule add ../a-submodule a-submodule &&
+       git -C repo-with-sub commit -m "added submodule" &&
+
+       SHALLOW=$(cat shallow/.git/shallow) &&
+       git -C repo-with-sub fetch --update-shallow ../shallow/.git "$SHALLOW":refs/heads/a-shallow
+'
+
 test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' '
        (
        cd shallow &&