From 20bdba15f6298040fd426a5071b336b87866cc53 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 6 Apr 2021 18:00:47 +1000
Subject: [PATCH] amend reword test

---
 pkg/commands/git_test.go                        |   2 +-
 .../expected/.git_keep/COMMIT_EDITMSG           |   2 +-
 .../rebaseReword/expected/.git_keep/index       | Bin 281 -> 353 bytes
 .../rebaseReword/expected/.git_keep/logs/HEAD   |   8 ++++----
 .../expected/.git_keep/logs/refs/heads/master   |   8 ++++----
 .../32/6168774f6c6d9b88ec70f0abe5625f07d3b353   |   4 ----
 .../59/f4e88de812c15bf0fa7b224cdb361f7ede8931   | Bin 0 -> 153 bytes
 .../5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1   | Bin 147 -> 0 bytes
 .../74/abc9e0d0ec8dd0f5ea872a851364206008ea2b   | Bin 0 -> 147 bytes
 .../97/066d3866b8e5ead0b68fc746a02222408f28a3   | Bin 0 -> 148 bytes
 .../b0/ec549c4d16bcfae63f59c6baaa94ce2756d879   | Bin 148 -> 0 bytes
 .../be/0070df1dcd3839a2d908622817fee59d918d4d   | Bin 150 -> 0 bytes
 .../d4/83ea1d742e44d9191f3e31e926d7621c513042   | Bin 0 -> 127 bytes
 .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b   | Bin 0 -> 21 bytes
 .../e2/98537fd470f70bbb174d78f610fe49539cfe66   |   2 ++
 .../expected/.git_keep/refs/heads/master        |   2 +-
 test/integration/rebaseReword/expected/file3    |   1 +
 test/integration/rebaseReword/recording.json    |   2 +-
 test/integration/rebaseReword/setup.sh          |   3 +++
 19 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353
 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931
 delete mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1
 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b
 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3
 delete mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879
 delete mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d
 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042
 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
 create mode 100644 test/integration/rebaseReword/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66
 create mode 100644 test/integration/rebaseReword/expected/file3

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 f86f898390a3ea83cb0bef351ef1bc13ab1687f0..e4963c7ceb21fada67146a08ec9f0e84a2b3f34d 100644
GIT binary patch
delta 224
zcmbQq^pHu##WTp6fq{Vuh*=VHM47lJJ!ON@j6g9q{jBd3RSd;}QaqcUcYvfoG(;+!
zZ(<Huiuc^hHjosEhDym#++t7*661TK$^fIGas~_xjY}997{3B-6#-(l``NtOXUd+v
z;XkEtNL|3oUt`x1X$ID`%$!tXpfm$RNRX>5kdkCDQ83`T()>!cM9<}>q`aNsOSS7s
eGJyt8Q!UN?|6ITEpK(joo$WJrZMU!db`=1x7D8tL

delta 152
zcmaFJG?Pii#WTp6fq{Vuh?x_zpWf!-{rMe6Gcqu+u<0cqo~U9d4wT{zUn2~X0?|;Z
zTN87@QhfEhyFpSQ8Y=aA;uZtbkRVrApvjU9#tH^p^E#IEp17fVY5o4IjAidD9(E}2
b(FsgAxB3566LX0#8vEl^7hV2UaK#<~3~D<M

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 0000000000000000000000000000000000000000..4cba53db22c39963b0c46a9ee50ae238544c8c9c
GIT binary patch
literal 153
zcmV;K0A~Mq0ez0k3c@fDMP27BvKM4BZ6^~D5xVMU<S{`ZF{MQC^UcDwXL&hXPHeS4
zyEbk)^+QBEVfGeM<iwZ~`W$jvz*v%OSqw8yA!1a!KjhW5vp|$4CJHQz_ymDCM>~@T
z9L&HO*-y&9`=cFt-Sl<c?(*?<FLH^k-n5}{?+5_(*#LkV>xk;|UpMg6Rel!1(u(>5
HJrFvwlbA@$

literal 0
HcmV?d00001

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 0571524c50125b6a89b489e050d19ed8fa3176fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmV;E0Brww0gaA93d0}}0DJZo-V4Rms4J9G$SKcQ*Odlh4Z%X6-#nq$VHk#cYwOUE
z>}4DxIte00Qy2@{QY_V6i#HI1)QAFz)@8P=b~@xebT-0%N<0+^nJY<f)h7;_h|<Jj
zqYnjRQuG<Ge&~78_j!5Bm)gF`jeC1&2xlH$a-gqZj8P{&r-uBgtGaGt)ekX&I?l)h
BLtp>^

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 0000000000000000000000000000000000000000..6b21dff7e483239dc61b84978beb2bc1591a4406
GIT binary patch
literal 147
zcmV;E0Brww0gaA93c@fDMP26<*$Xn6wv!2n2wn9UlVpO0#+DMn<C`P+mygHer@hv-
zSr_oqPE{L}Sv=&#nK5US5=)-IdD7xp9WxFwVKRrD`ffIOAj$(1Mb=3rLnJQAk0gM7
zBXB{M!N{k*_S4Rbz0b>2zfzA)Z)vX&>!{}g0ieA)05F~QQ%(QWO<6ZZ^8<>}Icd%2
BMZN$4

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..e2ccd0b98385cfd55f320553c50c8ec60ff3febb
GIT binary patch
literal 148
zcmV;F0Biqv0gcX03c@fDKw;N8MfQSBemd!Zh|pD!kxXW=(AZKUczk;Vw~ue}cx!Fx
z){(#TL&R1{$V|*YnRE6vpcYP<2CYGS0E`qdI<x0P-rb6)aR^CkOrQx$DK5pDMnwlI
zk%mC5f@t!mzqZ3pv%OFAQ@*+FtK4{N59`n+Bn0sG>Hxr;^_=SRCpWsR;>-`6syUj?
CMM|Uq

literal 0
HcmV?d00001

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 d1a2e4efe8f0618667292ae4b553c3f4ae08249d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 148
zcmV;F0Biqv0gcW<3d0}}K+&!}h5JGo9UT=)DP)yn=s40qY(lWm<2Og>_VX5>x89eb
zO|qA9i0BG|m=iOk%sJbN)Cz~3e5)uHfn0LrjN0=d@1fC>p%{W|#8gv>Q8++@T*Q<0
z4MN3&9##H~*LLV>*7s?C$~X6Yl^bvUp$(Zp5fd7HH2|Q_dQJ`bldHC@V$=_R<T+}+
CuSl{0

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 ca6f646d36ecab4749bd556ddcf18101bce0a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmV;H0BQet0fmms3c@fD06pg`au+0zCfS7|LQnmS&1Qpwv9(6<^X<XA*I^ijm)34w
zTQrBhiD(o6N~SOraHTk^xt3sTic%AZ1#mvIW3|#IkFK*34g>N~Y|LCqqOSotW+K9Y
z#ibAnBvkb7*JabwtjB4-$cNf`mlH4TtZm%$;L%%sw8j{<(|xMTA3gqb^`w{j0=j5A
EM6S|GTL1t6

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 0000000000000000000000000000000000000000..b0cd18a517f105dfb9219a4e44c7514c7a1a4757
GIT binary patch
literal 127
zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h
zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F
hDKKWZpUta%rtH}p{!<Ev)CIi!HFh151^{ESI51aCJI(+A

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e
GIT binary patch
literal 21
ccmb<m^geacKgb|i!&6t!@EH?>>`CU&08otwO#lD@

literal 0
HcmV?d00001

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 .