]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/ML: handle branches that were indirectly merged a bit better
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Jun 2012 00:21:54 +0000 (17:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Jun 2012 00:21:54 +0000 (17:21 -0700)
ML

diff --git a/ML b/ML
index 650a00d6e96744046913d47e026c31d7a310cce1..b4f56ab00abb13ea3f2b4921091fe648ce988d85 100755 (executable)
--- 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