diff options
Diffstat (limited to 'test/integration/pullMergeConflict')
54 files changed, 0 insertions, 148 deletions
diff --git a/test/integration/pullMergeConflict/expected/origin/HEAD b/test/integration/pullMergeConflict/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMergeConflict/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMergeConflict/expected/origin/config b/test/integration/pullMergeConflict/expected/origin/config deleted file mode 100644 index 53f811d27..000000000 --- a/test/integration/pullMergeConflict/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/actual/./repo diff --git a/test/integration/pullMergeConflict/expected/origin/description b/test/integration/pullMergeConflict/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMergeConflict/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMergeConflict/expected/origin/info/exclude b/test/integration/pullMergeConflict/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMergeConflict/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 Binary files differdeleted file mode 100644 index 7f2ebf4ee..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMergeConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 Binary files differdeleted file mode 100644 index f74bf2335..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c b/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c deleted file mode 100644 index 26794f8c9..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed$ c`R"~[(x껈JEÐp9DD C wyu[dQX<HU*#&ϙl n^. nS.um7 9`9sc˟ܴ.OA 9w
\ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMergeConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce Binary files differdeleted file mode 100644 index 0a734f981..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMergeConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 Binary files differdeleted file mode 100644 index 31ae3f5ba..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 b/test/integration/pullMergeConflict/expected/origin/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 Binary files differdeleted file mode 100644 index fa0ad87b7..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 b/test/integration/pullMergeConflict/expected/origin/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 deleted file mode 100644 index 4dcbc87d0..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJFJ\yL")#tyS5[ S0d"E,E,3Si4cGF{ozK՞LӀA;9i'w+5",
\ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMergeConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Binary files differdeleted file mode 100644 index 285df3e5f..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMergeConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 Binary files differdeleted file mode 100644 index 96d2e71a6..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d b/test/integration/pullMergeConflict/expected/origin/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d Binary files differdeleted file mode 100644 index 72dee6f91..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/c7/180f424ee6b59241eecffedcfa4472a86d927d +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMergeConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 Binary files differdeleted file mode 100644 index d39fa7d2f..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMergeConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b Binary files differdeleted file mode 100644 index 9b771fc2f..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/origin/packed-refs b/test/integration/pullMergeConflict/expected/origin/packed-refs deleted file mode 100644 index f70cbac49..000000000 --- a/test/integration/pullMergeConflict/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -29c0636a86cc64292b7a6b1083c2df10de9cde6c refs/heads/master diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 33d82ab34..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,25 +0,0 @@ -Merge branch 'master' of ../origin - -# Conflicts: -# myfile4 -# -# 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/pullMergeConflict/actual/repo/.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 master -# Your branch and 'origin/master' have diverged, -# and have 1 and 2 different commits each, respectively. -# (use "git pull" to merge the remote branch into yours) -# -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# new file: myfile3 -# modified: myfile4 -# diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 9aa8406f0..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -29c0636a86cc64292b7a6b1083c2df10de9cde6c branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 7dc5e85cc..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -4db288af7bc797a3819441c734a4c4e7e3635296 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/config b/test/integration/pullMergeConflict/expected/repo/.git_keep/config deleted file mode 100644 index 1cff3a489..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = false diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/description b/test/integration/pullMergeConflict/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/index b/test/integration/pullMergeConflict/expected/repo/.git_keep/index Binary files differdeleted file mode 100644 index bed2a78ec..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/index +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/info/exclude b/test/integration/pullMergeConflict/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d67e84881..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI <CI@example.com> 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI <CI@example.com> 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI <CI@example.com> 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI <CI@example.com> 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI <CI@example.com> 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d67e84881..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI <CI@example.com> 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI <CI@example.com> 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI <CI@example.com> 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI <CI@example.com> 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI <CI@example.com> 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 9d875f2ce..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI <CI@example.com> 1648349178 +1100 fetch origin: storing head diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 Binary files differdeleted file mode 100644 index 7f2ebf4ee..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 Binary files differdeleted file mode 100644 index f74bf2335..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c deleted file mode 100644 index 26794f8c9..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed$ c`R"~[(x껈JEÐp9DD C wyu[dQX<HU*#&ϙl n^. nS.um7 9`9sc˟ܴ.OA 9w
\ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce Binary files differdeleted file mode 100644 index 0a734f981..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 Binary files differdeleted file mode 100644 index 31ae3f5ba..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 deleted file mode 100644 index 53c1056c1..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e3635296 +++ /dev/null @@ -1,2 +0,0 @@ -xA -@ E])f/HҦDW=FIiGpy߶RhOuw9(`cITƄҍ7BĔKw_kdV Aܰ걎&Xscp-b"iGxF=NUS;͋Smj#=]
\ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 Binary files differdeleted file mode 100644 index fa0ad87b7..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 deleted file mode 100644 index 4dcbc87d0..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7c/201cb45dc62900f5f42281c1235219df5d0388 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJFJ\yL")#tyS5[ S0d"E,E,3Si4cGF{ozK՞LӀA;9i'w+5",
\ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2 Binary files differdeleted file mode 100644 index 2a3309a4c..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae Binary files differdeleted file mode 100644 index 13e3f581a..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Binary files differdeleted file mode 100644 index 285df3e5f..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 Binary files differdeleted file mode 100644 index 96d2e71a6..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 +++ /dev/null diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 deleted file mode 1 |