From 6d6504d1fd3741eb48bfd03e957b4666962dc160 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sat, 30 Jul 2022 00:36:06 -0500 Subject: [PATCH] test: fix for latest versions of git Since git 2.34 the big push with force test is broken thanks to: 726a228dfb (fast-export: fix surprising behavior with --first-parent, 2021-12-16) Since this only affects pushing multiple heads to the same branch, it probably is not that important. Signed-off-by: Felipe Contreras --- test/main.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/main.t b/test/main.t index 888d420..7c12c4d 100755 --- a/test/main.t +++ b/test/main.t @@ -682,7 +682,7 @@ test_expect_success 'remote big push force' ' EOF ) && - check_branch hgrepo default six && + check_branch hgrepo default four && check_branch hgrepo good_branch eight && check_branch hgrepo bad_branch nine && check_branch hgrepo new_branch ten &&