sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

amend reword test

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-06 18:00:47 +10:00
parent e636857057
commit 20bdba15f6
19 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git_test.go
View File

@ -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")
}

2
test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG
View File

@ -1 +1 @@
qas
file2lol

BIN
test/integration/rebaseReword/expected/.git_keep/index
View File

Binary file not shown.

8
test/integration/rebaseReword/expected/.git_keep/logs/HEAD
View File

@ -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

8
test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master
View File

@ -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

4
test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353
View File

@ -1,4 +0,0 @@
x<01><>A
<EFBFBD> @Ѯ=<3D><> eF<65><46><EFBFBD>
Y<EFBFBD>G<1A><18><><1C>9B<39><42>i<7F><69><1D><><EFBFBD>U u<>C<12><><EFBFBD>|̤<>C*\Ц\<5C>( <0B>5<EFBFBD><35>?<3F><>i<EFBFBD><69>4<EFBFBD><34><EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD>:y
~p<><><EE8488>פ<EFBFBD><D7A4>ܔuS4?ܰ+<2B>

BIN
test/integration/rebaseReword/expected/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 Normal file
View File

Binary file not shown.

BIN
test/integration/rebaseReword/expected/.git_keep/objects/5e/0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1
View File

Binary file not shown.

BIN
test/integration/rebaseReword/expected/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b Normal file
View File

Binary file not shown.

BIN
test/integration/rebaseReword/expected/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 Normal file
View File

Binary file not shown.

BIN
test/integration/rebaseReword/expected/.git_keep/objects/b0/ec549c4d16bcfae63f59c6baaa94ce2756d879
View File

Binary file not shown.

BIN
test/integration/rebaseReword/expected/.git_keep/objects/be/0070df1dcd3839a2d908622817fee59d918d4d
View File

Binary file not shown.

BIN
test/integration/rebaseReword/expected/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 Normal file
View File

Binary file not shown.

BIN
test/integration/rebaseReword/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b Normal file
View File

Binary file not shown.

2
test/integration/rebaseReword/expected/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 Normal file
View File

@ -0,0 +1,2 @@
x<01><>A
<EFBFBD>0Fa<46>9<EFBFBD><39><05><>c <63>U<EFBFBD><55>4<34><7F><EFBFBD>R"x|{<04><>޴<>6w<12>S<EFBFBD>\b6<62><36><EFBFBD>C*<02>=W<><57>s<EFBFBD>ޠ<EFBFBD><DEA0>]<5D><><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD>c_<><5F><EFBFBD>-<2D>Lk{<7B><04><><02><><EFBFBD>0<EFBFBD>;<3B>1<EFBFBD><31><EFBFBD><EFBFBD>:/`<60>څ+<2B>

2
test/integration/rebaseReword/expected/.git_keep/refs/heads/master
View File

@ -1 +1 @@
be0070df1dcd3839a2d908622817fee59d918d4d
59f4e88de812c15bf0fa7b224cdb361f7ede8931

1
test/integration/rebaseReword/expected/file3 Normal file
View File

@ -0,0 +1 @@
test3

2
test/integration/rebaseReword/recording.json
View File

@ -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}]}

3
test/integration/rebaseReword/setup.sh
View File

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