From e942edf96ea6229d3d02ae94da131679459bc0c6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 13 Jul 2026 11:07:10 -0700 Subject: [PATCH] onemerge: quick check and exit when the numbers match Before diving into inspecting each merge commit to see if it merges more than two topics at the same time, we can count the number of branches that are merged and the number of merge commits. If they match, we can skip the more expensive check. This will break if we merge a topic in multiple steps, but we do not do that these days, so it would be a reasonable optimization. --- onemerge.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/onemerge.sh b/onemerge.sh index d0bed02db5..43f07f9d61 100755 --- a/onemerge.sh +++ b/onemerge.sh @@ -4,6 +4,14 @@ endpoint=${1-seen} +cnt1=$(git lgf --grep="Merge branch '" master..$endpoint | wc -l) +cnt2=$(git branch --no-merged master --merged seen '??/*' | wc -l) + +if test $cnt1 -eq $cnt2 +then + exit 0 +fi + tmp=/var/tmp/e.$$ rm -f "$tmp.1" "$tmp.2" && prev= &&