Meta/CheckPush: fix the "does not match next" error case
When an early part of 'jch' does not match 'next', we showed the whole diff between next and jch, which was not very useful.
Junio C Hamano committed
Jun 23, 2016 at 15:19 UTC
9cda2823fdea91409d9ddfb5e08cd68c367526c2
1 file changed
+3
-6
CheckPush
+3
-6
@@ -72,10 +72,7 @@ then
72
else
73
echo "master..$next..next..$jch..jch..$pu..pu"
74
fi
75
-else
76
- echo "git diff --stat next jch"
77
- git diff --stat next jch
75
+elif match_next=$(git rev-parse 'jch^{/^### match next$}' 2>/dev/null)
76
+then
77
+ git diff --stat "$match_next" next
78
fi
79
-
80
-match_next=$(git rev-parse 'jch^{/^### match next}') || exit
81
-git diff --stat "$match_next" next