Meta/ML: handle branches that were indirectly merged a bit better
Junio C Hamano committed
Jun 3, 2012 at 17:21 UTC
aff55f9d9397b09e27c2d426ca20841049161c9c
1 file changed
+4
-2
ML
+4
-2
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