]> git.ipfire.org Git - thirdparty/git.git/commit - send-pack.c
send-pack: fix inconsistent porcelain output
authorJiang Xin <zhiyou.jx@alibaba-inc.com>
Fri, 17 Apr 2020 09:45:32 +0000 (05:45 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Apr 2020 19:16:31 +0000 (12:16 -0700)
commit7dcbeaa0df01661f31a0d93e5d5787a5d3767358
tree09801410b978d6e1295793b7248514175c960e35
parent274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925
send-pack: fix inconsistent porcelain output

The porcelain output of a failed `git-push` command is inconsistent for
different protocols.  For example, the following `git-push` command
may fail due to the failure of the `pre-receive` hook.

    git push --porcelain origin HEAD:refs/heads/master

For SSH protocol, the porcelain output does not end with a "Done"
message:

To <URL/of/upstream.git>
!  HEAD:refs/heads/master  [remote rejected] (pre-receive hook declined)

While for HTTP protocol, the porcelain output does end with a "Done"
message:

To <URL/of/upstream.git>
!  HEAD:refs/heads/master  [remote rejected] (pre-receive hook declined)
Done

The following code at the end of function `send_pack()` indicates that
`send_pack()` should not return an error if some references are rejected
in porcelain mode.

    int send_pack(...)
        ... ...

        if (args->porcelain)
            return 0;

        for (ref = remote_refs; ref; ref = ref->next) {
            switch (ref->status) {
            case REF_STATUS_NONE:
            case REF_STATUS_UPTODATE:
            case REF_STATUS_OK:
                break;
            default:
                return -1;
            }
        }
        return 0;
    }

So if atomic push failed, must check the porcelain mode before return
an error.  And `receive_status()` should not return an error for a
failed updated reference, because `send_pack()` will check them instead.

Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
send-pack.c
t/t5504-fetch-receive-strict.sh
t/t5516-fetch-push.sh
t/t5548-push-porcelain.sh [new file with mode: 0755]
transport.c