Meta/CheckPush: jch private edition could be more advanced than next
Junio C Hamano committed
Apr 12, 2012 at 15:39 UTC
21723c4f50dc4bf6b912975334b67f01cf9fe0b5
1 file changed
+7
-2
CheckPush
+7
-2
@@ -30,7 +30,7 @@ do
30
done
31
32
if next_tree=$(git rev-parse next^{tree}) &&
33
- next_equiv=$(git rev-list jch..pu |
33
+ next_equiv=$(git rev-list --first-parent master..pu |
34
xargs -n1 sh -c '
35
echo $(git rev-parse $1^{tree}) $1
36
' - | sed -n -e "s/^$next_tree //p"
@@ -40,7 +40,12 @@ then
40
jch=$(git rev-list --first-parent master..jch | wc -l) &&
41
pu=$(git rev-list --first-parent master..pu | wc -l) &&
42
next=$(git rev-list --first-parent master..$next_equiv | wc -l) &&
43
- echo $jch..$next..$pu
43
+ if test $jch -le $next
44
+ then
45
+ echo "master..$jch..jch..$next..next..$pu..pu"
46
+ else
47
+ echo "master..$next..next..$jch..jch..$pu..pu"
48
+ fi
49
else
50
git diff --stat next jch
51
fi