From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Jun 2016 22:19:01 +0000 (-0700)
Subject: Meta/CheckPush: fix the "does not match next" error case
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cda2823fdea91409d9ddfb5e08cd68c367526c2;p=thirdparty%2Fgit.git

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

diff --git a/CheckPush b/CheckPush
index 99c1ae2723..e8e4a46c56 100755
--- a/CheckPush
+++ b/CheckPush
@@ -72,10 +72,7 @@ then
 	else
 		echo "master..$next..next..$jch..jch..$pu..pu"
 	fi
-else
-	echo "git diff --stat next jch"
-	git diff --stat next jch
+elif match_next=$(git rev-parse 'jch^{/^### match next$}' 2>/dev/null)
+then
+	git diff --stat "$match_next" next
 fi
-
-match_next=$(git rev-parse 'jch^{/^### match next}') || exit
-git diff --stat "$match_next" next