test: fix rebase test

Author: Ryooooooga

pkg/integration/tests/sync/pull_merge_conflict.go

@@ -15,7 +15,8 @@ var PullMergeConflict = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.Commit("one")
 		shell.UpdateFileAndAdd("file", "content2")
 		shell.Commit("two")
-		shell.EmptyCommit("three")
+		shell.CreateFileAndAdd("file2", "content3")
+		shell.Commit("three")
 
 		shell.CloneIntoRemote("origin")
 

pkg/integration/tests/sync/pull_rebase.go

@@ -22,7 +22,8 @@ var PullRebase = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.SetBranchUpstream("master", "origin/master")
 
 		shell.HardReset("HEAD^^")
-		shell.EmptyCommit("four")
+		shell.CreateFileAndAdd("file2", "content3")
+		shell.Commit("four")
 
 		shell.SetConfig("pull.rebase", "true")
 	},

pkg/integration/tests/sync/pull_rebase_interactive_conflict.go

@@ -24,7 +24,8 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.HardReset("HEAD^^")
 		shell.UpdateFileAndAdd("file", "content4")
 		shell.Commit("four")
-		shell.EmptyCommit("five")
+		shell.CreateFileAndAdd("file2", "content5")
+		shell.Commit("five")
 
 		shell.SetConfig("pull.rebase", "interactive")
 	},

pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go

@@ -24,7 +24,8 @@ var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArg
 		shell.HardReset("HEAD^^")
 		shell.UpdateFileAndAdd("file", "content4")
 		shell.Commit("four")
-		shell.EmptyCommit("five")
+		shell.CreateFileAndAdd("file2", "content5")
+		shell.Commit("five")
 
 		shell.SetConfig("pull.rebase", "interactive")
 	},