From: Max Gautier <mg@max.gautier.name>
To: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Cc: git@vger.kernel.org, Denton Liu <liu.denton@gmail.com>
Subject: Re: Detecting squash-merged branches (and question about git-diff-tree)
Date: Tue, 3 Dec 2024 16:51:20 +0100 [thread overview]
Message-ID: <Z08o-O5eiu_ZsYrp@framework> (raw)
In-Reply-To: <75269425-49ee-4a16-beef-614da392d528@app.fastmail.com>
> I’m working on a program/script to detect merged/squashed/rebased (or
> cherry-picked) refs. Is it okay if I contact you if I finish it? ;)
Feel free to, yes
>
> There’s also this program which says it can do the same thing (not tried):
>
> https://github.com/foriequal0/git-trim
>
> My program tries to be like a for-each-ref for merged etc. refs.
> More focused on reporting first since that can then be used for
> deletion or whatever else.
Hum, I'm wondering why it didn't find this earlier, I did search though.
It apparently use git commit-tree to create a temporary commit, and git
cherry on that to check if it's in the target branch.
I wonder if this wouldn't cause problems in case of conflicts though,
during the git commit-tree process ?
--
Max Gautier
next prev parent reply other threads:[~2024-12-03 15:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-03 13:55 Detecting squash-merged branches (and question about git-diff-tree) Max Gautier
2024-12-03 15:30 ` Kristoffer Haugsbakk
2024-12-03 15:51 ` Max Gautier [this message]
2024-12-03 17:42 ` Kristoffer Haugsbakk
2024-12-03 16:18 ` Max Gautier
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=Z08o-O5eiu_ZsYrp@framework \
--to=mg@max.gautier.name \
--cc=git@vger.kernel.org \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=liu.denton@gmail.com \
/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).