1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00

add integration test for merge conflicts resolved externally

This commit is contained in:
Jesse Duffield
2022-01-17 18:29:13 +11:00
parent ee622d044e
commit d3a3c8d87d
29 changed files with 100 additions and 0 deletions

View File

@ -0,0 +1,6 @@
disableStartupPopups: true
customCommands:
- key: 'N'
description: 'Resolve conflict'
context: 'files'
command: 'echo "master2" > file'

View File

@ -0,0 +1,20 @@
Merge branch 'master' into other
# Conflicts:
# file
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflictsResolvedExternally/actual/.git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch other
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: file
#

View File

@ -0,0 +1 @@
ref: refs/heads/other

View File

@ -0,0 +1 @@
769c8b8d89700f6f196b8331159150746a839662

View File

@ -0,0 +1,10 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
email = CI@example.com
name = CI

View File

@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

View File

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

View File

@ -0,0 +1,7 @@
0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100 commit (initial): master1
03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100 checkout: moving from master to other
03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 769c8b8d89700f6f196b8331159150746a839662 CI <CI@example.com> 1642403134 +1100 commit: other1
769c8b8d89700f6f196b8331159150746a839662 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100 checkout: moving from other to master
03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 691ee9e9d9c654c81214f56c514ff725f46cb9e4 CI <CI@example.com> 1642403134 +1100 commit: master2
691ee9e9d9c654c81214f56c514ff725f46cb9e4 769c8b8d89700f6f196b8331159150746a839662 CI <CI@example.com> 1642403134 +1100 checkout: moving from master to other
769c8b8d89700f6f196b8331159150746a839662 f2df244fb87b6ba1d2ab484d76c66baba168a867 CI <CI@example.com> 1642403138 +1100 commit (merge): Merge branch 'master' into other

View File

@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100 commit (initial): master1
03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 691ee9e9d9c654c81214f56c514ff725f46cb9e4 CI <CI@example.com> 1642403134 +1100 commit: master2

View File

@ -0,0 +1,3 @@
0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100 branch: Created from HEAD
03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 769c8b8d89700f6f196b8331159150746a839662 CI <CI@example.com> 1642403134 +1100 commit: other1
769c8b8d89700f6f196b8331159150746a839662 f2df244fb87b6ba1d2ab484d76c66baba168a867 CI <CI@example.com> 1642403138 +1100 commit (merge): Merge branch 'master' into other

View File

@ -0,0 +1,4 @@
x<01><>A
1 @Q<>=E<><45>$<24><>v!"<22>j<EFBFBD><6A><EFBFBD>)
<EFBFBD><EFBFBD>X<EFBFBD><EFBFBD><EFBFBD>#<23><><<3C><><EFBFBD>=<06><0F><><EFBFBD>B<EFBFBD>ȹą<C8B9><C485><EFBFBD><EFBFBD>}TYbQ<62><51>8%<25><>H<EFBFBD><48>ϸ<EFBFBD><1D>
.<2E><76><EFBFBD><EBA9A7>

View File

@ -0,0 +1,3 @@
x<01><>A
<EFBFBD>0@Q<>9E<39><45><EFBFBD>d<EFBFBD>1"BW=F<>L<EFBFBD>`L <<3C>=<3D><><EFBFBD>[<5B><>j}<0E>B<EFBFBD><42>U<EFBFBD><55>jH<>Gv<47>p%<25>0<EFBFBD><16><>= ƫ<>c<EFBFBD><63><EFBFBD>@2I^<5E>\<5C><><EFBFBD>c( <20><>1{VL<56> }d?ck<63>΋<EFBFBD><CE8B><EFBFBD>C<EFBFBD><43><EFBFBD>/<2F><>V<EFBFBD>=;Bb{F0G=<3D><><EFBFBD><EFBFBD>M<1B>v4?
<EFBFBD>8<EFBFBD>

View File

@ -0,0 +1 @@
691ee9e9d9c654c81214f56c514ff725f46cb9e4

View File

@ -0,0 +1 @@
f2df244fb87b6ba1d2ab484d76c66baba168a867

View File

@ -0,0 +1 @@
master2

View File

@ -0,0 +1 @@
{"KeyEvents":[{"Timestamp":438,"Mod":0,"Key":259,"Ch":0},{"Timestamp":663,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1206,"Mod":0,"Key":256,"Ch":77},{"Timestamp":1487,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2045,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2951,"Mod":0,"Key":256,"Ch":78},{"Timestamp":3606,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4343,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

View File

@ -0,0 +1,27 @@
#!/bin/sh
cd $1
git init
git config user.email "CI@example.com"
git config user.name "CI"
git checkout -b master
echo "master1" > file
git add .
git commit -m "master1"
git checkout -b other
echo "other1" > file
git add .
git commit -m "other1"
git checkout master
echo "master2" > file
git add .
git commit -m "master2"
git checkout other

View File

@ -0,0 +1,4 @@
{
"description": "This test verifies that merge conflicts resolved externally are recognised by lazygit and the user is prompted to continue",
"speed": 10
}