development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

commit-reach(paint_down_to_common): start reporting errors

Browse source 
If a commit cannot be parsed, it is currently ignored when looking for
merge bases. That's undesirable as the operation can pretend success in
a corrupt repository, even though the command should fail with an error
message.

Let's start at the bottom of the stack by teaching the
`paint_down_to_common()` function to return an `int`: if negative, it
indicates fatal error, if 0 success.

This requires a couple of callers to be adjusted accordingly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2024-02-28 09:44:11 +00:00 committed by Junio C Hamano
parent 2d2da172f3
commit 896a0e11f3
1 changed files with 45 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
commit-reach.c
View file

@ -49,14 +49,14 @@ static int queue_has_nonstale(struct prio_queue *queue)
} }
/* all input commits in one and twos[] must have been parsed! */ /* all input commits in one and twos[] must have been parsed! */
static struct commit_list *paint_down_to_common(struct repository *r, static int paint_down_to_common(struct repository *r,
struct commit *one, int n, struct commit *one, int n,
struct commit **twos, struct commit **twos,
timestamp_t min_generation, timestamp_t min_generation,
int ignore_missing_commits) int ignore_missing_commits,
struct commit_list **result)
{ {
struct prio_queue queue = { compare_commits_by_gen_then_commit_date }; struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
struct commit_list *result = NULL;
int i; int i;
timestamp_t last_gen = GENERATION_NUMBER_INFINITY; timestamp_t last_gen = GENERATION_NUMBER_INFINITY;
@ -65,8 +65,8 @@ static struct commit_list *paint_down_to_common(struct repository *r,
one->object.flags |= PARENT1; one->object.flags |= PARENT1;
if (!n) { if (!n) {
commit_list_append(one, &result); commit_list_append(one, result);
return result; return 0;
} }
prio_queue_put(&queue, one); prio_queue_put(&queue, one);
@ -94,7 +94,7 @@ static struct commit_list *paint_down_to_common(struct repository *r,
if (flags == (PARENT1 | PARENT2)) { if (flags == (PARENT1 | PARENT2)) {
if (!(commit->object.flags & RESULT)) { if (!(commit->object.flags & RESULT)) {
commit->object.flags |= RESULT; commit->object.flags |= RESULT;
commit_list_insert_by_date(commit, &result); commit_list_insert_by_date(commit, result);
} }
/* Mark parents of a found merge stale */ /* Mark parents of a found merge stale */
flags |= STALE; flags |= STALE;
@ -107,7 +107,8 @@ static struct commit_list *paint_down_to_common(struct repository *r,
continue; continue;
if (repo_parse_commit(r, p)) { if (repo_parse_commit(r, p)) {
clear_prio_queue(&queue); clear_prio_queue(&queue);
free_commit_list(result); free_commit_list(*result);
*result = NULL;
/* /*
* At this stage, we know that the commit is * At this stage, we know that the commit is
* missing: `repo_parse_commit()` uses * missing: `repo_parse_commit()` uses
@ -115,7 +116,10 @@ static struct commit_list *paint_down_to_common(struct repository *r,
* corrupt commits would already have been * corrupt commits would already have been
* dispatched with a `die()`. * dispatched with a `die()`.
*/ */
return NULL; if (ignore_missing_commits)
return 0;
return error(_("could not parse commit %s"),
oid_to_hex(&p->object.oid));
} }
p->object.flags |= flags; p->object.flags |= flags;
prio_queue_put(&queue, p); prio_queue_put(&queue, p);
@ -123,7 +127,7 @@ static struct commit_list *paint_down_to_common(struct repository *r,
} }
clear_prio_queue(&queue); clear_prio_queue(&queue);
return result; return 0;
} }
static struct commit_list *merge_bases_many(struct repository *r, static struct commit_list *merge_bases_many(struct repository *r,
@ -150,7 +154,10 @@ static struct commit_list *merge_bases_many(struct repository *r,
return NULL; return NULL;
} }
list = paint_down_to_common(r, one, n, twos, 0, 0); if (paint_down_to_common(r, one, n, twos, 0, 0, &list)) {
free_commit_list(list);
return NULL;
}
while (list) { while (list) {
struct commit *commit = pop_commit(&list); struct commit *commit = pop_commit(&list);
@ -204,7 +211,7 @@ static int remove_redundant_no_gen(struct repository *r,
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
repo_parse_commit(r, array[i]); repo_parse_commit(r, array[i]);
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
struct commit_list *common; struct commit_list *common = NULL;
timestamp_t min_generation = commit_graph_generation(array[i]); timestamp_t min_generation = commit_graph_generation(array[i]);
if (redundant[i]) if (redundant[i])
@ -220,8 +227,16 @@ static int remove_redundant_no_gen(struct repository *r,
if (curr_generation < min_generation) if (curr_generation < min_generation)
min_generation = curr_generation; min_generation = curr_generation;
} }
common = paint_down_to_common(r, array[i], filled, if (paint_down_to_common(r, array[i], filled,
work, min_generation, 0); work, min_generation, 0, &common)) {
clear_commit_marks(array[i], all_flags);
clear_commit_marks_many(filled, work, all_flags);
free_commit_list(common);
free(work);
free(redundant);
free(filled_index);
return -1;
}
if (array[i]->object.flags & PARENT2) if (array[i]->object.flags & PARENT2)
redundant[i] = 1; redundant[i] = 1;
for (j = 0; j < filled; j++) for (j = 0; j < filled; j++)
@ -421,6 +436,10 @@ static struct commit_list *get_merge_bases_many_0(struct repository *r,
clear_commit_marks_many(n, twos, all_flags); clear_commit_marks_many(n, twos, all_flags);
cnt = remove_redundant(r, rslt, cnt); cnt = remove_redundant(r, rslt, cnt);
if (cnt < 0) {
free(rslt);
return NULL;
}
result = NULL; 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);
@ -490,7 +509,7 @@ int repo_in_merge_bases_many(struct repository *r, struct commit *commit,
int nr_reference, struct commit **reference, int nr_reference, struct commit **reference,
int ignore_missing_commits) int ignore_missing_commits)
{ {
struct commit_list *bases; struct commit_list *bases = NULL;
int ret = 0, i; int ret = 0, i;
timestamp_t generation, max_generation = GENERATION_NUMBER_ZERO; timestamp_t generation, max_generation = GENERATION_NUMBER_ZERO;
@ -509,10 +528,11 @@ int repo_in_merge_bases_many(struct repository *r, struct commit *commit,
if (generation > max_generation) if (generation > max_generation)
return ret; return ret;
bases = paint_down_to_common(r, commit, if (paint_down_to_common(r, commit,
nr_reference, reference, nr_reference, reference,
generation, ignore_missing_commits); generation, ignore_missing_commits, &bases))
if (commit->object.flags & PARENT2) ret = -1;
else if (commit->object.flags & PARENT2)
ret = 1; ret = 1;
clear_commit_marks(commit, all_flags); clear_commit_marks(commit, all_flags);
clear_commit_marks_many(nr_reference, reference, all_flags); clear_commit_marks_many(nr_reference, reference, all_flags);
@ -565,6 +585,10 @@ struct commit_list *reduce_heads(struct commit_list *heads)
} }
} }
num_head = remove_redundant(the_repository, array, num_head); num_head = remove_redundant(the_repository, array, num_head);
if (num_head < 0) {
free(array);
return NULL;
}
for (i = 0; i < num_head; i++) for (i = 0; i < num_head; i++)
tail = &commit_list_insert(array[i], tail)->next; tail = &commit_list_insert(array[i], tail)->next;
free(array); free(array);