From 9a4e945cebb27a363a4d150affdade25258d3207 Mon Sep 17 00:00:00 2001 From: emilylange Date: Mon, 4 Nov 2024 17:34:54 +0100 Subject: [PATCH] nixos/tests/forgejo: fix after git v2.47 bump git v2.47.0 made changes to trace2's nesting. trace2.eventNesting (GIT_TRACE2_EVENT_NESTING) defaults to 2, but the nested region we are after gained a level and is now at level 3 instead of 2. eventNesting describes the maximum nesting level to be logged. So to make it log the negotated-version in connect.c again, we increase the default by one, from 2 to 3. --- nixos/tests/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix index d2315b7f013e..5e6f19e56df0 100644 --- a/nixos/tests/forgejo.nix +++ b/nixos/tests/forgejo.nix @@ -188,7 +188,7 @@ let assert "hello world" == client.succeed("cat /tmp/repo-clone/testfile").strip() with subtest("Testing git protocol version=2 over ssh"): - git_protocol = client.succeed("GIT_TRACE2_EVENT=true git -C /tmp/repo-clone fetch |& grep negotiated-version") + git_protocol = client.succeed("GIT_TRACE2_EVENT=true GIT_TRACE2_EVENT_NESTING=3 git -C /tmp/repo-clone fetch |& grep negotiated-version") version = json.loads(git_protocol).get("value") assert version == "2", f"git did not negotiate protocol version 2, but version {version} instead."