mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-12 12:55:47 +02:00
add integration test for rewording old commit
This commit is contained in:
parent
e5096e71ab
commit
3b30b9bba2
63 changed files with 73 additions and 0 deletions
Binary file not shown.
BIN
test/integration/rebaseRewordLastCommit/expected/.git_keep/index
Normal file
BIN
test/integration/rebaseRewordLastCommit/expected/.git_keep/index
Normal file
Binary file not shown.
|
@ -0,0 +1 @@
|
||||||
|
file1 2
|
|
@ -0,0 +1 @@
|
||||||
|
ref: refs/heads/master
|
|
@ -0,0 +1 @@
|
||||||
|
3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f
|
|
@ -0,0 +1,10 @@
|
||||||
|
[core]
|
||||||
|
repositoryformatversion = 0
|
||||||
|
filemode = true
|
||||||
|
bare = false
|
||||||
|
logallrefupdates = true
|
||||||
|
ignorecase = true
|
||||||
|
precomposeunicode = true
|
||||||
|
[user]
|
||||||
|
email = CI@example.com
|
||||||
|
name = CI
|
|
@ -0,0 +1 @@
|
||||||
|
Unnamed repository; edit this file 'description' to name the repository.
|
BIN
test/integration/rebaseRewordOldCommit/expected/.git_keep/index
Normal file
BIN
test/integration/rebaseRewordOldCommit/expected/.git_keep/index
Normal file
Binary file not shown.
|
@ -0,0 +1,7 @@
|
||||||
|
# git ls-files --others --exclude-from=.git/info/exclude
|
||||||
|
# Lines that start with '#' are comments.
|
||||||
|
# For a project mostly in C, the following would be a good set of
|
||||||
|
# exclude patterns (uncomment them if you want to use them):
|
||||||
|
# *.[oa]
|
||||||
|
# *~
|
||||||
|
.DS_Store
|
|
@ -0,0 +1,9 @@
|
||||||
|
0000000000000000000000000000000000000000 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI <CI@example.com> 1641696830 +1100 commit (initial): file0
|
||||||
|
4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI <CI@example.com> 1641696830 +1100 commit: file1
|
||||||
|
3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI <CI@example.com> 1641696830 +1100 commit: file2
|
||||||
|
7c5b8c907caad01842aa84e91b7d4724d57de4fd 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI <CI@example.com> 1641696835 +1100 rebase: updating HEAD
|
||||||
|
7c5b8c907caad01842aa84e91b7d4724d57de4fd 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI <CI@example.com> 1641696835 +1100 rebase -i (start): checkout 4479c0a1c7e43a55a3a6909be88a810dbad3fc42
|
||||||
|
4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI <CI@example.com> 1641696835 +1100 rebase -i: fast-forward
|
||||||
|
3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 1bcb7e30b3a5a5ae64397dcfe6b74cc18fc55784 CI <CI@example.com> 1641696835 +1100 commit (amend): file1 2
|
||||||
|
1bcb7e30b3a5a5ae64397dcfe6b74cc18fc55784 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI <CI@example.com> 1641696835 +1100 rebase -i (pick): file2
|
||||||
|
9d793e4fc04a0583eed7670d52fbb16b402f7499 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI <CI@example.com> 1641696835 +1100 rebase -i (finish): returning to refs/heads/master
|
|
@ -0,0 +1,4 @@
|
||||||
|
0000000000000000000000000000000000000000 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI <CI@example.com> 1641696830 +1100 commit (initial): file0
|
||||||
|
4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI <CI@example.com> 1641696830 +1100 commit: file1
|
||||||
|
3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI <CI@example.com> 1641696830 +1100 commit: file2
|
||||||
|
7c5b8c907caad01842aa84e91b7d4724d57de4fd 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI <CI@example.com> 1641696835 +1100 rebase -i (finish): refs/heads/master onto 4479c0a1c7e43a55a3a6909be88a810dbad3fc42
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,4 @@
|
||||||
|
x<01>ÏAj1…á®çÞ‚e˶J d•UÎ ‘d¨3aÆ<61>¿³é>ÛÇ<07>_–ÞïÃ…„c5sŠ<14>ACÔ
|
||||||
|
Z´VCÖ’H‚è1LO^í1\‘4“T_„Y=fB«0ÅPSQæÿ^|©qF
|
||||||
|
¢
|
||||||
|
#eÊ:·”›xÆl•‚÷Ñ`â׸-«;_Ü×ùr²_îÏ;ÈÒ¿d„\3Åä>¼Ÿöu<C3B6>ö&Ÿ®×yÛýÑí7Ë6x»ýGÎL}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,2 @@
|
||||||
|
x+)JMU03c040031QHヒフI5`ーアコイ燹ヨカwチ<77>w.ス<><EFBDBD>モ[H
|
||||||
|
矢y<E79FA2>5<EFBFBD>来ミ(桍ァ^-ンW(x9
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1 @@
|
||||||
|
9d793e4fc04a0583eed7670d52fbb16b402f7499
|
1
test/integration/rebaseRewordOldCommit/expected/file0
Normal file
1
test/integration/rebaseRewordOldCommit/expected/file0
Normal file
|
@ -0,0 +1 @@
|
||||||
|
test0
|
1
test/integration/rebaseRewordOldCommit/expected/file1
Normal file
1
test/integration/rebaseRewordOldCommit/expected/file1
Normal file
|
@ -0,0 +1 @@
|
||||||
|
test1
|
1
test/integration/rebaseRewordOldCommit/expected/file2
Normal file
1
test/integration/rebaseRewordOldCommit/expected/file2
Normal file
|
@ -0,0 +1 @@
|
||||||
|
test2
|
1
test/integration/rebaseRewordOldCommit/expected/file3
Normal file
1
test/integration/rebaseRewordOldCommit/expected/file3
Normal file
|
@ -0,0 +1 @@
|
||||||
|
test3
|
1
test/integration/rebaseRewordOldCommit/recording.json
Normal file
1
test/integration/rebaseRewordOldCommit/recording.json
Normal file
|
@ -0,0 +1 @@
|
||||||
|
{"KeyEvents":[{"Timestamp":1013,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1332,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1811,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2643,"Mod":0,"Key":256,"Ch":114},{"Timestamp":3269,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3795,"Mod":0,"Key":256,"Ch":50},{"Timestamp":4420,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5859,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
|
23
test/integration/rebaseRewordOldCommit/setup.sh
Normal file
23
test/integration/rebaseRewordOldCommit/setup.sh
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
cd $1
|
||||||
|
|
||||||
|
git init
|
||||||
|
|
||||||
|
git config user.email "CI@example.com"
|
||||||
|
git config user.name "CI"
|
||||||
|
|
||||||
|
echo test0 > file0
|
||||||
|
git add .
|
||||||
|
git commit -am file0
|
||||||
|
|
||||||
|
echo test1 > file1
|
||||||
|
git add .
|
||||||
|
git commit -am file1
|
||||||
|
|
||||||
|
echo test2 > file2
|
||||||
|
git add .
|
||||||
|
git commit -am file2
|
||||||
|
|
||||||
|
echo test3 > file3
|
||||||
|
git add .
|
4
test/integration/rebaseRewordOldCommit/test.json
Normal file
4
test/integration/rebaseRewordOldCommit/test.json
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"description": "Rewording old commit",
|
||||||
|
"speed": 20
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue