]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
SCRIPTS: git-show-backports: hide the common ancestor warning in quiet mode
authorWilly Tarreau <w@1wt.eu>
Mon, 9 Mar 2026 14:17:52 +0000 (15:17 +0100)
committerWilly Tarreau <w@1wt.eu>
Mon, 9 Mar 2026 14:36:02 +0000 (15:36 +0100)
It's annoying to always see that warning in quiet mode when backporting
upstream to topic branches, let's hide it.

scripts/git-show-backports

index 9f0a3dfda5496b918b1cac65dd1a17fecf31812c..ce2f7c73d349435fe51bc49d1486a93ec04c6ffe 100755 (executable)
@@ -255,7 +255,7 @@ if [ -z "$BASE" -a -n "$MISSING" ]; then
 fi
 
 if [ -z "$BASE" ]; then
-       err "Warning! No base specified, looking for common ancestor."
+       [ "$QUIET" != "" ] || err "Warning! No base specified, looking for common ancestor."
        BASE=$(git merge-base --all "$REF" "${BRANCHES[@]}")
        if [ -z "$BASE" ]; then
                die "Couldn't find a common ancestor between these branches"