amend reword test

pkg/commands/git_test.go

@@ -487,7 +487,7 @@ func TestGitCommandRenameCommit(t *testing.T) {
 	gitCmd := NewDummyGitCommand()
 	gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
 		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"commit", "--allow-empty", "--amend", "-m", "test"}, args)
+		assert.EqualValues(t, []string{"commit", "--allow-empty", "--amend", "--only", "-m", "test"}, args)
 
 		return secureexec.Command("echo")
 	}

test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG

@@ -1 +1 @@
-qas
+file2lol

test/integration/rebaseReword/expected/.git_keep/logs/HEAD

@@ -1,4 +1,4 @@
-0000000000000000000000000000000000000000 326168774f6c6d9b88ec70f0abe5625f07d3b353 CI <CI@example.com> 1617683931 +1000	commit (initial): file0
-326168774f6c6d9b88ec70f0abe5625f07d3b353 b0ec549c4d16bcfae63f59c6baaa94ce2756d879 CI <CI@example.com> 1617683931 +1000	commit: file1
-b0ec549c4d16bcfae63f59c6baaa94ce2756d879 5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 CI <CI@example.com> 1617683931 +1000	commit: file2
-5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 be0070df1dcd3839a2d908622817fee59d918d4d CI <CI@example.com> 1617683936 +1000	commit (amend): qas
+0000000000000000000000000000000000000000 e298537fd470f70bbb174d78f610fe49539cfe66 CI <CI@example.com> 1617696002 +1000	commit (initial): file0
+e298537fd470f70bbb174d78f610fe49539cfe66 97066d3866b8e5ead0b68fc746a02222408f28a3 CI <CI@example.com> 1617696002 +1000	commit: file1
+97066d3866b8e5ead0b68fc746a02222408f28a3 74abc9e0d0ec8dd0f5ea872a851364206008ea2b CI <CI@example.com> 1617696002 +1000	commit: file2
+74abc9e0d0ec8dd0f5ea872a851364206008ea2b 59f4e88de812c15bf0fa7b224cdb361f7ede8931 CI <CI@example.com> 1617696010 +1000	commit (amend): file2lol

test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master

@@ -1,4 +1,4 @@
-0000000000000000000000000000000000000000 326168774f6c6d9b88ec70f0abe5625f07d3b353 CI <CI@example.com> 1617683931 +1000	commit (initial): file0
-326168774f6c6d9b88ec70f0abe5625f07d3b353 b0ec549c4d16bcfae63f59c6baaa94ce2756d879 CI <CI@example.com> 1617683931 +1000	commit: file1
-b0ec549c4d16bcfae63f59c6baaa94ce2756d879 5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 CI <CI@example.com> 1617683931 +1000	commit: file2
-5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 be0070df1dcd3839a2d908622817fee59d918d4d CI <CI@example.com> 1617683936 +1000	commit (amend): qas
+0000000000000000000000000000000000000000 e298537fd470f70bbb174d78f610fe49539cfe66 CI <CI@example.com> 1617696002 +1000	commit (initial): file0
+e298537fd470f70bbb174d78f610fe49539cfe66 97066d3866b8e5ead0b68fc746a02222408f28a3 CI <CI@example.com> 1617696002 +1000	commit: file1
+97066d3866b8e5ead0b68fc746a02222408f28a3 74abc9e0d0ec8dd0f5ea872a851364206008ea2b CI <CI@example.com> 1617696002 +1000	commit: file2
+74abc9e0d0ec8dd0f5ea872a851364206008ea2b 59f4e88de812c15bf0fa7b224cdb361f7ede8931 CI <CI@example.com> 1617696010 +1000	commit (amend): file2lol

test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353

@@ -1,4 +0,0 @@
-x
��A
-� @Ѯ=��eF���
-Y�G����9B��i�����U u�C���|̤�C*\Ц\�(�5��?��i��4���u����:y
-~p���פ��ܔuS4?ܰ+�

test/integration/rebaseReword/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66

@@ -0,0 +1,2 @@
+x
��A
+�0Fa�9����c �U��4���R"x|{��޴�6w�S�
\b6���C*�=W��s�ޠ��]�����0�c_���-�Lk{������0�;�1����:/`�څ+�

test/integration/rebaseReword/expected/.git_keep/refs/heads/master

@@ -1 +1 @@
-be0070df1dcd3839a2d908622817fee59d918d4d
+59f4e88de812c15bf0fa7b224cdb361f7ede8931

test/integration/rebaseReword/expected/file3

@@ -0,0 +1 @@
+test3

test/integration/rebaseReword/recording.json

@@ -1 +1 @@
-{"KeyEvents":[{"Timestamp":715,"Mod":0,"Key":259,"Ch":0},{"Timestamp":978,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2098,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2730,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2930,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3154,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3410,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3682,"Mod":0,"Key":271,"Ch":0},{"Timestamp":4306,"Mod":0,"Key":256,"Ch":113},{"Timestamp":4658,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4922,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5322,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6066,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
+{"KeyEvents":[{"Timestamp":1593,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1889,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2896,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4200,"Mod":0,"Key":256,"Ch":108},{"Timestamp":5153,"Mod":0,"Key":256,"Ch":111},{"Timestamp":5609,"Mod":0,"Key":256,"Ch":108},{"Timestamp":8609,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9520,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/rebaseReword/setup.sh

@@ -18,3 +18,6 @@ git commit -am file1
 echo test2 > file2
 git add .
 git commit -am file2
+
+echo test3 > file3
+git add .