Re: Detecting squash-merged branches (and question about git-diff-tree)

From: Max Gautier <mg@max.gautier.name>
Date: Dec 3, 2024, 15:51 UTC
Message-ID: <Z08o-O5eiu_ZsYrp@framework>
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

Show 8 quoted lines

> 
> 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