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

todo
Junio C Hamano 2012-06-03 17:21:54 -07:00
parent df72e6ec0e
commit aff55f9d93
1 changed files with 4 additions and 2 deletions

6
ML
View File

@ -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