amend reword test

19 files changed, 18 insertions, 16 deletions

diff --git a/pkg/commands/git_test.go b/pkg/commands/git_test.go
index 5f24eacf3..afefb921c 100644
--- a/pkg/commands/git_test.go
+++ b/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")
 	}
diff --git a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG
index c18cd76ce..3a4521c05 100644
--- a/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG
+++ b/test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG
@@ -1 +1 @@
-qas
+file2lol
diff --git a/test/integration/rebaseReword/expected/.git_keep/index b/test/integration/rebaseReword/expected/.git_keep/index
index f86f89839..e4963c7ce 100644
--- a/test/integration/rebaseReword/expected/.git_keep/index
+++ b/test/integration/rebaseReword/expected/.git_keep/index
diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/HEAD b/test/integration/rebaseReword/expected/.git_keep/logs/HEAD
index d6b1c711e..3646fdd64 100644
--- a/test/integration/rebaseReword/expected/.git_keep/logs/HEAD
+++ b/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
diff --git a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master b/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master
index d6b1c711e..3646fdd64 100644
--- a/test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master
+++ b/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
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353 b/test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353
deleted file mode 100644
index 2d56ce435..000000000
--- a/test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353
+++ /dev/null
@@ -1,4 +0,0 @@
-x
��A
-� @Ѯ=��eF���
-Y�G����9B��i�����U u�C���|̤�C*\Ц\�(�5��?�i��4���u����:y
-~p��פ�ܔuS4?ܰ+�
\ No newline at end of file
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 b/test/integration/rebaseReword/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931
new file mode 100644
index 000000000..4cba53db2
--- /dev/null
+++ b/test/integration/rebaseReword/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 b/test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1
deleted file mode 100644
index 0571524c5..000000000
--- a/test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1
+++ /dev/null
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b b/test/integration/rebaseReword/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b
new file mode 100644
index 000000000..6b21dff7e
--- /dev/null
+++ b/test/integration/rebaseReword/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 b/test/integration/rebaseReword/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3
new file mode 100644
index 000000000..e2ccd0b98
--- /dev/null
+++ b/test/integration/rebaseReword/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879 b/test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879
deleted file mode 100644
index d1a2e4efe..000000000
--- a/test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879
+++ /dev/null
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d b/test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d
deleted file mode 100644
index ca6f646d3..000000000
--- a/test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d
+++ /dev/null
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 b/test/integration/rebaseReword/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042
new file mode 100644
index 000000000..b0cd18a51
--- /dev/null
+++ b/test/integration/rebaseReword/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseReword/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
new file mode 100644
index 000000000..9b771fc2f
--- /dev/null
+++ b/test/integration/rebaseReword/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
diff --git a/test/integration/rebaseReword/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 b/test/integration/rebaseReword/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66
new file mode 100644
index 000000000..f07b23840
--- /dev/null
+++ b/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����:/`�څ+�
\ No newline at end of file
diff --git a/test/integration/rebaseReword/expected/.git_keep/refs/heads/master b/test/integration/rebaseReword/expected/.git_keep/refs/heads/master
index ec7aaf6be..ada8401bb 100644
--- a/test/integration/rebaseReword/expected/.git_keep/refs/heads/master
+++ b/test/integration/rebaseReword/expected/.git_keep/refs/heads/master
@@ -1 +1 @@
-be0070df1dcd3839a2d908622817fee59d918d4d
+59f4e88de812c15bf0fa7b224cdb361f7ede8931
diff --git a/test/integration/rebaseReword/expected/file3 b/test/integration/rebaseReword/expected/file3
new file mode 100644
index 000000000..df6b0d2bc
--- /dev/null
+++ b/test/integration/rebaseReword/expected/file3
@@ -0,0 +1 @@
+test3
diff --git a/test/integration/rebaseReword/recording.json b/test/integration/rebaseReword/recording.json
index 5f3537e08..4ffb9bd50 100644
--- a/test/integration/rebaseReword/recording.json
+++ b/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}]}
\ No newline at end of file
+{"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}]}
\ No newline at end of file
diff --git a/test/integration/rebaseReword/setup.sh b/test/integration/rebaseReword/setup.sh
index 9b9e01321..42957e626 100644
--- a/test/integration/rebaseReword/setup.sh
+++ b/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 .