diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:00:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:00:44 -0700 |
| commit | 24ecfdf206ee0e9e01f86d333d90d281fdfd12d0 (patch) | |
| tree | cebd8275c93f7a86afa85fb6ed69fe0691034f3f /commit-graph.c | |
| parent | Merge branch 'ct/diff-with-merge-base-clarification' into master (diff) | |
| parent | commit.c: don't persist substituted parents when unshallowing (diff) | |
| download | tgif-24ecfdf206ee0e9e01f86d333d90d281fdfd12d0.tar.xz | |
Merge branch 'tb/fix-persistent-shallow' into master
When "fetch.writeCommitGraph" configuration is set in a shallow
repository and a fetch moves the shallow boundary, we wrote out
broken commit-graph files that do not match the reality, which has
been corrected.
* tb/fix-persistent-shallow:
commit.c: don't persist substituted parents when unshallowing
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/commit-graph.c b/commit-graph.c index fdd1c4fa7c..328ab06fd4 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -203,7 +203,8 @@ static int commit_graph_compatible(struct repository *r) } prepare_commit_graft(r); - if (r->parsed_objects && r->parsed_objects->grafts_nr) + if (r->parsed_objects && + (r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent)) return 0; if (is_repository_shallow(r)) return 0; |