]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/CheckPush: fix the "does not match next" error case
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Jun 2016 22:19:01 +0000 (15:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Jun 2016 22:19:01 +0000 (15:19 -0700)
When an early part of 'jch' does not match 'next', we showed the
whole diff between next and jch, which was not very useful.

CheckPush

index 99c1ae27236280013a1e84e44d1b8e3e0a4ec099..e8e4a46c56b2cae4bdb8bd823f9cf6a6da6b41f1 100755 (executable)
--- 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