kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

commit-reach(get_merge_bases_many_0): pass on "missing commits" errors 

The `merge_bases_many()` function was just taught to indicate
parsing errors, and now the `get_merge_bases_many_0()` function is aware
of that, too.

Next step: adjust the callers of `get_merge_bases_many_0()`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2024-02-28 09:44:13 +00:00 committed by Junio C Hamano
parent fb02c523a3
commit 8226e157a9
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
commit-reach.c
View File

@ -409,37 +409,38 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
return remove_redundant_no_gen(r, array, cnt); return remove_redundant_no_gen(r, array, cnt);
} }


static struct commit_list *get_merge_bases_many_0(struct repository *r, static int get_merge_bases_many_0(struct repository *r,
struct commit *one, struct commit *one,
int n, int n,
struct commit **twos, struct commit **twos,
int cleanup) int cleanup,
struct commit_list **result)
{ {
struct commit_list *list; struct commit_list *list;
struct commit **rslt; struct commit **rslt;
struct commit_list *result = NULL;
int cnt, i; int cnt, i;


if (merge_bases_many(r, one, n, twos, &result) < 0) if (merge_bases_many(r, one, n, twos, result) < 0)
return NULL; return -1;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (one == twos[i]) if (one == twos[i])
return result; return 0;
} }
if (!result || !result->next) { if (!*result || !(*result)->next) {
if (cleanup) { if (cleanup) {
clear_commit_marks(one, all_flags); clear_commit_marks(one, all_flags);
clear_commit_marks_many(n, twos, all_flags); clear_commit_marks_many(n, twos, all_flags);
} }
return result; return 0;
} }


/* There are more than one */ /* There are more than one */
cnt = commit_list_count(result); cnt = commit_list_count(*result);
CALLOC_ARRAY(rslt, cnt); CALLOC_ARRAY(rslt, cnt);
for (list = result, i = 0; list; list = list->next) for (list = *result, i = 0; list; list = list->next)
rslt[i++] = list->item; rslt[i++] = list->item;
free_commit_list(result); free_commit_list(*result);
*result = NULL;


clear_commit_marks(one, all_flags); clear_commit_marks(one, all_flags);
clear_commit_marks_many(n, twos, all_flags); clear_commit_marks_many(n, twos, all_flags);
@ -447,13 +448,12 @@ static struct commit_list *get_merge_bases_many_0(struct repository *r,
cnt = remove_redundant(r, rslt, cnt); cnt = remove_redundant(r, rslt, cnt);
if (cnt < 0) { if (cnt < 0) {
free(rslt); free(rslt);
return NULL; return -1;
} }
result = NULL;
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
commit_list_insert_by_date(rslt[i], &result); commit_list_insert_by_date(rslt[i], result);
free(rslt); free(rslt);
return result; return 0;
} }


struct commit_list *repo_get_merge_bases_many(struct repository *r, struct commit_list *repo_get_merge_bases_many(struct repository *r,
@ -461,7 +461,12 @@ struct commit_list *repo_get_merge_bases_many(struct repository *r,
int n, int n,
struct commit **twos) struct commit **twos)
{ {
return get_merge_bases_many_0(r, one, n, twos, 1); struct commit_list *result = NULL;
if (get_merge_bases_many_0(r, one, n, twos, 1, &result) < 0) {
free_commit_list(result);
return NULL;
}
return result;
} }


struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r, struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
@ -469,14 +474,24 @@ struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
int n, int n,
struct commit **twos) struct commit **twos)
{ {
return get_merge_bases_many_0(r, one, n, twos, 0); struct commit_list *result = NULL;
if (get_merge_bases_many_0(r, one, n, twos, 0, &result) < 0) {
free_commit_list(result);
return NULL;
}
return result;
} }


struct commit_list *repo_get_merge_bases(struct repository *r, struct commit_list *repo_get_merge_bases(struct repository *r,
struct commit *one, struct commit *one,
struct commit *two) struct commit *two)
{ {
return get_merge_bases_many_0(r, one, 1, &two, 1); struct commit_list *result = NULL;
if (get_merge_bases_many_0(r, one, 1, &two, 1, &result) < 0) {
free_commit_list(result);
return NULL;
}
return result;
} }


/* /*