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
@@ -32,13 +32,15 @@ search_topics () {
32
echo >&2 "$tip moved from $sha1"
33
continue
34
fi
35
- ago=
35
+
36
+ ago= lg=0
37
fp=$(
38
sed -ne "s/^\($x40\) $x40 $tip"'$/\1/p' "$tmp"
39
) &&
40
+ test -n "$fp" &&
41
ago=$(
42
git show -s --format='%ar' $fp
41
- )
43
+ ) &&
44
lg=$(git log --oneline $target..$tip | wc -l)
45
if test $lg != 0
46
then