diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-28 09:45:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-28 09:45:22 -0700 |
| commit | ddcb8fd8b94c066406c2a4f41e04122cb2a742ad (patch) | |
| tree | ae13c7c5f6efeb4d21a25d97e4109df4a8816589 /commit.c | |
| parent | Merge branch 'rs/describe-parseopt-fix' (diff) | |
| parent | pack-objects: fix --no-quiet (diff) | |
| download | git-ddcb8fd8b94c066406c2a4f41e04122cb2a742ad.tar.gz git-ddcb8fd8b94c066406c2a4f41e04122cb2a742ad.zip | |
Merge branch 'rs/pack-objects-parseopt-fix'
Command line parser fix.
* rs/pack-objects-parseopt-fix:
pack-objects: fix --no-quiet
pack-objects: fix --no-keep-true-parents
Diffstat (limited to 'commit.c')
| -rw-r--r-- | commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -516,7 +516,7 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b * The clone is shallow if nr_parent < 0, and we must * not traverse its real parents even when we unhide them. */ - if (graft && (graft->nr_parent < 0 || grafts_replace_parents)) + if (graft && (graft->nr_parent < 0 || !grafts_keep_true_parents)) continue; new_parent = lookup_commit(r, &parent); if (!new_parent) |