From: "Jean-Noël Avila" <avila.jn@gmail.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>, git@vger.kernel.org
Cc: Johannes Sixt <j6t@kdbg.org>, Elijah Newren <newren@gmail.com>,
Michael Lohmann <mial.lohmann@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Patrick Steinhardt <ps@pks.im>,
Junio C Hamano <gitster@pobox.com>,
Michael Lohmann <mi.al.lohmann@gmail.com>
Subject: Re: [PATCH v5 1/2] revision: ensure MERGE_HEAD is a ref in prepare_show_merge
Date: Mon, 26 Feb 2024 18:22:50 +0100 [thread overview]
Message-ID: <c46a0a4f-63dc-404a-8ee2-64a34f474c5f@gmail.com> (raw)
In-Reply-To: <20240225-ml-log-merge-with-cherry-pick-and-other-pseudo-heads-v5-1-af1ef2d9e44d@gmail.com>
Hello,
Le 25/02/2024 à 22:56, Philippe Blain a écrit :
> From: Michael Lohmann <mi.al.lohmann@gmail.com>
>
> 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@pobox.com>
> Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
> ---
> 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.
next prev parent reply other threads:[~2024-02-26 17:22 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 23:33 [RFC PATCH] `log --merge` also for rebase/cherry pick/revert Michael Lohmann
2024-01-12 0:15 ` Junio C Hamano
2024-01-12 15:50 ` [PATCH v2 1/2] revision: ensure MERGE_HEAD is a ref in prepare_show_merge Michael Lohmann
2024-01-12 15:50 ` [PATCH v2 2/2] revision: Implement `git log --merge` also for rebase/cherry_pick/revert Michael Lohmann
2024-01-12 20:10 ` [PATCH v2 1/2] revision: ensure MERGE_HEAD is a ref in prepare_show_merge Junio C Hamano
2024-01-15 11:36 ` Patrick Steinhardt
2024-01-15 17:19 ` Junio C Hamano
2024-01-17 8:14 ` [PATCH v3 " Michael Lohmann
2024-01-17 8:14 ` [PATCH v3 2/2] revision: Implement `git log --merge` also for rebase/cherry_pick/revert Michael Lohmann
2024-01-17 9:19 ` Full disclosure Michael Lohmann
2024-01-17 9:58 ` Christian Couder
2024-01-17 17:41 ` Michael Lohmann
2024-01-21 0:41 ` Ruben Safir
2024-01-17 18:33 ` Junio C Hamano
2024-01-24 7:06 ` [PATCH v3 2/2] revision: Implement `git log --merge` also for rebase/cherry_pick/revert Elijah Newren
2024-01-24 17:19 ` Johannes Sixt
2024-01-24 19:46 ` Junio C Hamano
2024-01-24 22:06 ` Johannes Sixt
2024-01-24 22:13 ` Junio C Hamano
2024-02-09 23:54 ` Junio C Hamano
2024-01-24 17:34 ` Junio C Hamano
2024-02-10 23:35 ` [PATCH v4 0/2] Implement `git log --merge` also for rebase/cherry-pick/revert Philippe Blain
2024-02-10 23:35 ` [PATCH v4 1/2] revision: ensure MERGE_HEAD is a ref in prepare_show_merge Philippe Blain
2024-02-10 23:35 ` [PATCH v4 2/2] revision: implement `git log --merge` also for rebase/cherry-pick/revert Philippe Blain
2024-02-11 8:34 ` Johannes Sixt
2024-02-11 16:43 ` Philippe Blain
2024-02-11 17:59 ` Johannes Sixt
2024-02-12 18:27 ` Junio C Hamano
2024-02-12 11:02 ` Phillip Wood
2024-02-13 13:27 ` Philippe Blain
2024-02-14 11:02 ` Phillip Wood
2024-02-13 8:33 ` Jean-Noël Avila
2024-02-13 13:14 ` Philippe Blain
2024-02-25 21:56 ` [PATCH v5 0/2] Implement " Philippe Blain
2024-02-25 21:56 ` [PATCH v5 1/2] revision: ensure MERGE_HEAD is a ref in prepare_show_merge Philippe Blain
2024-02-26 17:22 ` Jean-Noël Avila [this message]
2024-02-26 17:54 ` Philippe Blain
2024-02-25 21:56 ` [PATCH v5 2/2] revision: implement `git log --merge` also for rebase/cherry-pick/revert Philippe Blain
2024-02-26 4:35 ` Junio C Hamano
2024-02-26 17:43 ` Philippe Blain
2024-02-27 14:00 ` [PATCH v5 0/2] Implement " Phillip Wood
2024-02-27 18:30 ` Junio C Hamano
2024-02-28 13:54 ` [PATCH v6 " Philippe Blain
2024-02-28 13:54 ` [PATCH v6 1/2] revision: ensure MERGE_HEAD is a ref in prepare_show_merge Philippe Blain
2024-02-28 13:54 ` [PATCH v6 2/2] revision: implement `git log --merge` also for rebase/cherry-pick/revert Philippe Blain
2024-02-28 14:40 ` [PATCH v6 0/2] Implement " phillip.wood123
2024-03-02 15:35 ` Philippe Blain
2024-01-12 7:35 ` [RFC PATCH] `log --merge` also for rebase/cherry pick/revert Johannes Sixt
2024-01-12 7:59 ` Johannes Sixt
2024-01-12 20:18 ` Junio C Hamano
2024-01-12 11:01 ` phillip.wood123
2024-01-12 15:03 ` Michael Lohmann
2024-01-12 21:14 ` Junio C Hamano
2024-01-15 10:48 ` Phillip Wood
2024-01-12 20:21 ` Junio C Hamano
2024-01-12 21:06 ` Michael Lohmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c46a0a4f-63dc-404a-8ee2-64a34f474c5f@gmail.com \
--to=avila.jn@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=levraiphilippeblain@gmail.com \
--cc=mi.al.lohmann@gmail.com \
--cc=mial.lohmann@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).