From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Jun 2012 00:21:54 +0000 (-0700)
Subject: Meta/ML: handle branches that were indirectly merged a bit better
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aff55f9d9397b09e27c2d426ca20841049161c9c;p=thirdparty%2Fgit.git

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

diff --git a/ML b/ML
index 650a00d6e9..b4f56ab00a 100755
--- 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