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
This commit is contained in:
2
commit.c
2
commit.c
@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user