Hello,
Le 25/02/2024 à 22:56, Philippe Blain a écrit :
> From: Michael Lohmann <mi.al.lohmann@xxxxxxxxx>
>
> This is done to
> (1) ensure MERGE_HEAD is a ref,
> (2) obtain the oid without any prefixing by refs.c:repo_dwim_ref()
> (3) error out when MERGE_HEAD is a symref.
>
> Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
> Signed-off-by: Michael Lohmann <mi.al.lohmann@xxxxxxxxx>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> Signed-off-by: Philippe Blain <levraiphilippeblain@xxxxxxxxx>
> ---
> revision.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/revision.c b/revision.c
> index 2424c9bd67..ee26988cc6 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -1973,8 +1973,12 @@ static void prepare_show_merge(struct rev_info *revs)
> if (repo_get_oid(the_repository, "HEAD", &oid))
> die("--merge without HEAD?");
> head = lookup_commit_or_die(&oid, "HEAD");
> - if (repo_get_oid(the_repository, "MERGE_HEAD", &oid))
> + if (read_ref_full("MERGE_HEAD",
> + RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
> + &oid, NULL))
> die("--merge without MERGE_HEAD?");
> + if (is_null_oid(&oid))
> + die(_("MERGE_HEAD is a symbolic ref?"));
Following the thread about being less passive-aggressive, maybe this
could be rephrased in an assertive mood.
By the way, this string is translatable, but not the one 2 lines above.
What is the policy around translation?
> other = lookup_commit_or_die(&oid, "MERGE_HEAD");
> add_pending_object(revs, &head->object, "HEAD");
> add_pending_object(revs, &other->object, "MERGE_HEAD");
>
Thanks.
