]> git.ipfire.org Git - thirdparty/git.git/commitdiff
CheckPush: 'next' could be identical to 'master'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Nov 2023 06:09:18 +0000 (15:09 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Nov 2023 17:01:15 +0000 (02:01 +0900)
CheckPush

index 61b71d8b99145e24bfd1dd1aa4f6c7e317caf56b..e79f364e8e7247e9d3d32ab215681674f610d34b 100755 (executable)
--- a/CheckPush
+++ b/CheckPush
@@ -63,7 +63,7 @@ if ! next_equiv=$(git rev-parse --verify 'jch^{/^### match next}' 2>/dev/null) |
    ! git diff --stat --exit-code next $next_equiv
 then
        next_tree=$(git rev-parse next^{tree}) &&
-       next_equiv=$(git rev-list --first-parent $MASTER..seen |
+       next_equiv=$(git rev-list --first-parent $MASTER^..seen |
                        xargs -n1 sh -c '
                                echo $(git rev-parse $1^{tree}) $1
                        ' - | sed -n -e "s/^$next_tree //p"