mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cocci: apply the "commit-reach.h" part of "the_repository.pending"

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2023-03-28 15:58:47 +02:00
committed by Junio C Hamano
parent d850b7a545
commit cb338c23d6
26 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
notes-merge.c
View File

@ -600,7 +600,7 @@ int notes_merge(struct notes_merge_options *o,
assert(local && remote);
/* Find merge bases */
bases = get_merge_bases(local, remote);
bases = repo_get_merge_bases(the_repository, local, remote);
if (!bases) {
base_oid = null_oid();
base_tree_oid = the_hash_algo->empty_tree;