@matheusbsbs / matheus-bagliano / commits / b81f8c8dd3

send-pack: gracefully close the connection for atomic push

Patrick reported an issue that the exit code of git-receive-pack(1) is ignored during atomic push with "--porcelain" flag, and added new test cases in t5543. This issue originated from commit 7dcbeaa0df (send-pack: fix inconsistent porcelain output, 2020-04-17). At that time, I chose to ignore the exit code of "finish_connect()" without investigating the root cause of the abnormal termination of git-receive-pack. That was an incorrect solution. The root cause is that an atomic push operation terminates early without sending a flush packet to git-receive-pack. As a result, git-receive-pack continues waiting for commands without exiting. By sending a flush packet at the appropriate location in "send_pack()", we ensure that the git-receive-pack process closes properly, avoiding an erroneous exit code for git-push. At the same time, revert the changes to the "transport.c" file made in commit 7dcbeaa0df. Reported-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jiang Xin committed Feb 3, 2025 at 07:29 UTC b81f8c8dd3ec81a8d622e2d3d6b2af426ca53f05

3 files changed +4 -11

send-pack.c

@@ -633,6 +633,7 @@ int send_pack(struct repository *r,

633 error("atomic push failed for ref %s. status: %d",

634 ref->name, ref->status);

635 ret = ERROR_SEND_PACK_BAD_REF_STATUS;

636 + packet_flush(out);

637 goto out;

638 }

639 /* else fallthrough */

t/t5543-atomic-push.sh

+2 -2

@@ -280,7 +280,7 @@ test_expect_success 'atomic push reports (reject by non-ff)' '

280 test_cmp expect actual

281 '

282

283 -test_expect_failure 'atomic push reports exit code failure' '

283 +test_expect_success 'atomic push reports exit code failure' '

284 write_script receive-pack-wrapper <<-\EOF &&

285 git-receive-pack "$@"

286 exit 1

@@ -296,7 +296,7 @@ test_expect_failure 'atomic push reports exit code failure' '

296 test_cmp expect err

297 '

298

299 -test_expect_failure 'atomic push reports exit code failure with porcelain' '

299 +test_expect_success 'atomic push reports exit code failure with porcelain' '

300 write_script receive-pack-wrapper <<-\EOF &&

301 git-receive-pack "$@"

302 exit 1

transport.c

+1 -9

@@ -948,15 +948,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re

948

949 close(data->fd[1]);

950 close(data->fd[0]);

951 - /*

952 - * Atomic push may abort the connection early and close the pipe,

953 - * which may cause an error for `finish_connect()`. Ignore this error

954 - * for atomic git-push.

955 - */

956 - if (ret || args.atomic)

957 - finish_connect(data->conn);

958 - else

959 - ret = finish_connect(data->conn);

951 + ret |= finish_connect(data->conn);

952 data->conn = NULL;

953 data->finished_handshake = 0;

954