Meta/ML: handle branches that were indirectly merged a bit better

gitster · gitster · commit aff55f9d9397 · 2012-06-03T17:21:54.000-07:00
diff --git a/ML b/ML
@@ -32,13 +32,15 @@ search_topics () {
 			echo >&2 "$tip moved from $sha1"
 			continue
 		fi
-		ago=
+
+		ago= lg=0
 		fp=$(
 		    sed -ne "s/^\($x40\) $x40 $tip"'$/\1/p' "$tmp"
 		) &&
+		test -n "$fp" &&
 		ago=$(
 		    git show -s --format='%ar' $fp
-		)
+		) &&
 		lg=$(git log --oneline $target..$tip | wc -l)
 		if test $lg != 0
 		then
