From b127831ed1f3cbfde90b3c131bd6d171ebdcd279 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 23 Aug 2026 21:26:20 -0700 Subject: [PATCH] Meta/onemerge: force C locale on comm The script has 'comm' compare two 'git branch --list' output, which is strictly ASCII/lexicographic order. In en_US locale, for example, the 'git branch --list' output order may not look sorted, e.g. 'pack-objects' may sort before or after 'packfile'. --- onemerge.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/onemerge.sh b/onemerge.sh index 309290df50..c98d113c41 100755 --- a/onemerge.sh +++ b/onemerge.sh @@ -2,6 +2,8 @@ # between master..seen, are there merges that bring in # more than one topic at a time? +export LANG=C LC_ALL=C + endpoint=${1-seen} cnt1=$(git lgf --grep="Merge branch '" master..$endpoint | wc -l)