From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2024 21:14:42 +0000 (-0700)
Subject: Meta/ML: correctly detect topic that is not in 'master'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47e36b3df75a7adc105f7349a7675b0abf2db9df;p=thirdparty%2Fgit.git

Meta/ML: correctly detect topic that is not in 'master'
---

diff --git a/ML b/ML
index 35bf9b35b8..c560d738b4 100755
--- 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