Explicitly pass --no-autosquash when rebasing

This fixes the problem shown in the previous commit.
2023-02-09 18:21:11 +01:00
parent e357c00d4d
commit 1da762c295
3 changed files with 4 additions and 6 deletions
--- a/pkg/integration/tests/branch/rebase_does_not_autosquash.go
+++ b/pkg/integration/tests/branch/rebase_does_not_autosquash.go
@@ -45,9 +45,7 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{
 			Confirm()

 		t.Views().Commits().Lines(
-			/* Expected the fixup to be kept, but it's gone:
 			Contains("fixup! branch commit"),
-			*/
 			Contains("branch commit"),
 			Contains("master commit"),
 			Contains("base"),