diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2023-03-28 15:58:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-28 07:36:36 -0700 |
| commit | cb338c23d6d518947bf6f7240bf30e2ec232bd3b (patch) | |
| tree | 03396382848bae350d813b706265918cd93f1ba2 /builtin/fast-import.c | |
| parent | cocci: apply the "cache.h" part of "the_repository.pending" (diff) | |
| download | git-cb338c23d6d518947bf6f7240bf30e2ec232bd3b.tar.gz git-cb338c23d6d518947bf6f7240bf30e2ec232bd3b.zip | |
cocci: apply the "commit-reach.h" part of "the_repository.pending"
Apply the part of "the_repository.pending.cocci" pertaining to
"commit-reach.h".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fast-import.c')
| -rw-r--r-- | builtin/fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fast-import.c b/builtin/fast-import.c index f533b768ef..2098c0c5a3 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -1625,7 +1625,7 @@ static int update_branch(struct branch *b) if (!old_cmit || !new_cmit) return error("Branch %s is missing commits.", b->name); - if (!in_merge_bases(old_cmit, new_cmit)) { + if (!repo_in_merge_bases(the_repository, old_cmit, new_cmit)) { warning("Not updating %s" " (new tip %s does not contain %s)", b->name, oid_to_hex(&b->oid), |