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.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.c')
-rw-r--r-- | commit.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -423,6 +423,8 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b pptr = &item->parents; graft = lookup_commit_graft(r, &item->object.oid); + if (graft) + r->parsed_objects->substituted_parent = 1; while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) { struct commit *new_parent; |