From: phillip.wood123@gmail.com
To: Michael Lohmann <mi.al.lohmann@gmail.com>, git@vger.kernel.org
Subject: Re: [RFC PATCH] `log --merge` also for rebase/cherry pick/revert
Date: Fri, 12 Jan 2024 11:01:21 +0000 [thread overview]
Message-ID: <47a4418b-68bf-4850-ba8b-1a5264f923e4@gmail.com> (raw)
In-Reply-To: <20240111233311.64734-1-mi.al.lohmann@gmail.com>
Hi Michael
On 11/01/2024 23:33, Michael Lohmann wrote:
> This extends the functionality of `git log --merge` to also work with
> conflicts for rebase, cherry pick and revert.
>
> Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com>
> ---
> Hi everybody!
>
> When Phillip Wood gave me some nice hints on his workflow concerning
> conflicts [1] (we discussed if `--show-current-patch` would make sense
> for cherry pick/revert). When I learned about `git log --merge` I was a
> bit sad to discover that those do not exist for rebase/revert/cherry
> pick since they look really valuable for getting an understanding on
> what was changed. It is basically the counterpart to
> `git show ${ACTION}_HEAD` for understanding the source of the conflict.
>
> I am curious if also other people would be interested in having an easy
> way to get a log of only the relevant commits touching conflicting files
> for said actions.
>
> With this patch I think the functionality is there, just hijacking the
> `--merge` code - maybe an alias like `git log --conflict` or similar
> might be more descriptive now?
>
> What do you think about this idea? (Or am I maybe missing an easy way to
> achieve it with the existing code as well?)
I should start by saying that I didn't know "git log --merge" existed
before I saw this message so please correct me if I've misunderstood
what this patch is doing. If I understand correctly it shows the commits
from each side of the merge and is equivalent to
git log HEAD MERGE_HEAD ^$(git merge-base HEAD MERGE_HEAD)
When a commit is cherry-picked the merge base used is CHERRY_PICK_HEAD^
[*] so I'm not sure what
git log HEAD CHERRY_PICK_HEAD ^$(git merge-base HEAD CHERRY_PICK_HEAD)
tells us. Indeed there HEAD and CHERRY_PICK_HEAD may not share a common
ancestor. As I say I've not used "git log --merge" so maybe I'm missing
the reason why it would be useful when cherry-picking or rebasing.
Best Wishes
Phillip
[*] assuming we're not picking a merge commit
> Michael
>
>
> [1] https://lore.kernel.org/git/cfba7098-3c23-4a81-933c-b7fefdedec8a@gmail.com/
>
> revision.c | 22 ++++++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/revision.c b/revision.c
> index 2424c9bd67..2e5c00dabd 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -1961,23 +1961,37 @@ static void add_pending_commit_list(struct rev_info *revs,
> }
> }
>
> +static char* get_action_head_name(struct object_id* oid)
> +{
> + if (!repo_get_oid(the_repository, "MERGE_HEAD", oid)) {
> + return "MERGE_HEAD";
> + } else if (!repo_get_oid(the_repository, "REBASE_HEAD", oid)) {
> + return "REBASE_HEAD";
> + } else if (!repo_get_oid(the_repository, "CHERRY_PICK_HEAD", oid)) {
> + return "CHERRY_PICK_HEAD";
> + } else if (!repo_get_oid(the_repository, "REVERT_HEAD", oid)) {
> + return "REVERT_HEAD";
> + } else
> + die("--merge without MERGE_HEAD, REBASE_HEAD, CHERRY_PICK_HEAD or REVERT_HEAD?");
> +}
> +
> static void prepare_show_merge(struct rev_info *revs)
> {
> struct commit_list *bases;
> struct commit *head, *other;
> struct object_id oid;
> const char **prune = NULL;
> + const char *action_head_name;
> int i, prune_num = 1; /* counting terminating NULL */
> struct index_state *istate = revs->repo->index;
>
> 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))
> - die("--merge without MERGE_HEAD?");
> - other = lookup_commit_or_die(&oid, "MERGE_HEAD");
> + action_head_name = get_action_head_name(&oid);
> + other = lookup_commit_or_die(&oid, action_head_name);
> add_pending_object(revs, &head->object, "HEAD");
> - add_pending_object(revs, &other->object, "MERGE_HEAD");
> + add_pending_object(revs, &other->object, action_head_name);
> bases = repo_get_merge_bases(the_repository, head, other);
> add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
> add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
next prev parent reply other threads:[~2024-01-12 11:01 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
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 [this message]
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=47a4418b-68bf-4850-ba8b-1a5264f923e4@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=mi.al.lohmann@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).