Re: [PATCH v6 0/2] Implement `git log --merge` also for rebase/cherry-pick/revert
- From
- phillip.wood123@gmail.com <phillip.wood123@gmail.com>
- Date
- Feb 28, 2024, 14:40 UTC
- Message-ID
- <3875a0dc-6ef2-4bd3-9852-c180043464c3@gmail.com>
- In-Reply-To
- <20240228-ml-log-merge-with-cherry-pick-and-other-pseudo-heads-v6-0-8ec34c052b39@gmail.com>
Hi Philippe
On 28/02/2024 13:54, Philippe Blain wrote:
Show 10 quoted lines
> Range-diff versus v5: > > 1: c9536431d1 ! 1: 363657561c revision: ensure MERGE_HEAD is a ref in prepare_show_merge > @@ Commit message > (2) obtain the oid without any prefixing by refs.c:repo_dwim_ref() > (3) error out when MERGE_HEAD is a symref. > > + Note that we avoid marking the new error message for translation as it > + will be done in the next commit when the message is generalized to other > + special refs.
Looking at the change below, the new message is in fact marked for translation. I don't think this matters (other than the commit message being confusing) as the translators will only see the final version of the massage.
Show 9 quoted lines
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> @@ revision.c: static void prepare_show_merge(struct rev_info *revs)
> + &oid, NULL))
> die("--merge without MERGE_HEAD?");
> + if (is_null_oid(&oid))
> -+ die(_("MERGE_HEAD is a symbolic ref?"));
> ++ die(_("MERGE_HEAD exists but is a symbolic ref"));The new message is marked with _(...) so will be translated.
Show 10 quoted lines
> other = lookup_commit_or_die(&oid, "MERGE_HEAD");
> add_pending_object(revs, &head->object, "HEAD");
> add_pending_object(revs, &other->object, "MERGE_HEAD");
> 2: 1641c4be81 ! 2: 749abadc04 revision: implement `git log --merge` also for rebase/cherry-pick/revert
> @@ revision.c: static void add_pending_commit_list(struct rev_info *revs,
> + RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
> + oid, NULL)) {
> + if (is_null_oid(oid))
> -+ die(_("%s is a symbolic ref?"), other_head[i]);
> ++ die(_("%s exists but is a symbolic ref"), other_head[i]);The second patch updates the message and this new version retains the _(...)
Best Wishes
Phillip
Show 13 quoted lines
> + return other_head[i];
> + }
> +
> @@ revision.c: static void prepare_show_merge(struct rev_info *revs)
> - &oid, NULL))
> - die("--merge without MERGE_HEAD?");
> - if (is_null_oid(&oid))
> -- die(_("MERGE_HEAD is a symbolic ref?"));
> +- die(_("MERGE_HEAD exists but is a symbolic ref"));
> - other = lookup_commit_or_die(&oid, "MERGE_HEAD");
> + other_name = lookup_other_head(&oid);
> + other = lookup_commit_or_die(&oid, other_name);
>