]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/ML: correctly detect topic that is not in 'master'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2024 21:14:42 +0000 (14:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2024 21:14:42 +0000 (14:14 -0700)
ML

diff --git a/ML b/ML
index 35bf9b35b8e21019ff2f03d6809e3cfbc3af232c..c560d738b4f06f7e2cb56b5d77f073bee11f04dc 100755 (executable)
--- a/ML
+++ b/ML
@@ -35,7 +35,7 @@ search_topics () {
                        continue
                fi
 
-               ago= lg=0
+               ago= lg=-1
                fp=$(
                    sed -ne "s/^\($x40\) $x40 $tip"'$/\1/p' "$tmp"
                ) &&
@@ -44,7 +44,11 @@ search_topics () {
                    git show -s --format='%ad' --date=short $fp
                ) &&
                lg=$(git log --oneline $target..$tip | wc -l)
-               if test $lg != 0
+
+               if test $lg = -1
+               then
+                       echo "# $topic not yet merged to $here"
+               elif test $lg != 0
                then
                        echo "$topic # $lg${ago+ ($ago)}${comment+ $comment}"
                else