diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-10-22 20:18:40 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-10-22 21:33:17 +1100 |
| commit | 2008c3951616f9b366b320e805dcbd0c5da6ce96 (patch) | |
| tree | 5d4efb2a961acd1cdeca293e2771f8a34764cfcb /test/integration/pullMergeConflict/expected | |
| parent | 6388af70acda91bf1bdc9cba9f38dc810f49f9ca (diff) | |
add tests for dealing with remotes
Diffstat (limited to 'test/integration/pullMergeConflict/expected')
34 files changed, 80 insertions, 0 deletions
diff --git a/test/integration/pullMergeConflict/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullMergeConflict/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..ce92bd599 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,25 @@ +Merge branch 'master' of ../actual_remote + +# 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/.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/.git_keep/FETCH_HEAD b/test/integration/pullMergeConflict/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..bd1ba7678 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +38699899bb94dfae74e3e55cf5bd6d92e6f3292a branch 'master' of ../actual_remote diff --git a/test/integration/pullMergeConflict/expected/.git_keep/HEAD b/test/integration/pullMergeConflict/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullMergeConflict/expected/.git_keep/ORIG_HEAD b/test/integration/pullMergeConflict/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..703055cf2 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +7dba68a0030313e27b8dd5da2076952629485f2d diff --git a/test/integration/pullMergeConflict/expected/.git_keep/config b/test/integration/pullMergeConflict/expected/.git_keep/config new file mode 100644 index 000000000..110d1b43e --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/config @@ -0,0 +1,18 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI +[remote "origin"] + url = ../actual_remote + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master +[pull] + rebase = false diff --git a/test/integration/pullMergeConflict/expected/.git_keep/description b/test/integration/pullMergeConflict/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMergeConflict/expected/.git_keep/index b/test/integration/pullMergeConflict/expected/.git_keep/index Binary files differnew file mode 100644 index 000000000..d9ffd9453 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/index diff --git a/test/integration/pullMergeConflict/expected/.git_keep/info/exclude b/test/integration/pullMergeConflict/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/info/exclude @@ -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 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/logs/HEAD b/test/integration/pullMergeConflict/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..566b28a05 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 f0e8e7922de77a5ab20b924640c8b8435bae0b0b CI <CI@example.com> 1634896911 +1100 commit (initial): myfile1 +f0e8e7922de77a5ab20b924640c8b8435bae0b0b ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI <CI@example.com> 1634896911 +1100 commit: myfile2 +ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 CI <CI@example.com> 1634896911 +1100 commit: myfile3 +80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI <CI@example.com> 1634896911 +1100 commit: myfile4 +38699899bb94dfae74e3e55cf5bd6d92e6f3292a ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI <CI@example.com> 1634896911 +1100 reset: moving to head^^ +ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 7dba68a0030313e27b8dd5da2076952629485f2d CI <CI@example.com> 1634896911 +1100 commit: myfile4 conflict +7dba68a0030313e27b8dd5da2076952629485f2d 720c7e2dd34822d33cb24a0a3f0f4bdabf433500 CI <CI@example.com> 1634896916 +1100 commit (merge): Merge branch 'master' of ../actual_remote diff --git a/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/heads/master b/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..566b28a05 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 f0e8e7922de77a5ab20b924640c8b8435bae0b0b CI <CI@example.com> 1634896911 +1100 commit (initial): myfile1 +f0e8e7922de77a5ab20b924640c8b8435bae0b0b ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI <CI@example.com> 1634896911 +1100 commit: myfile2 +ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 CI <CI@example.com> 1634896911 +1100 commit: myfile3 +80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI <CI@example.com> 1634896911 +1100 commit: myfile4 +38699899bb94dfae74e3e55cf5bd6d92e6f3292a ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI <CI@example.com> 1634896911 +1100 reset: moving to head^^ +ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 7dba68a0030313e27b8dd5da2076952629485f2d CI <CI@example.com> 1634896911 +1100 commit: myfile4 conflict +7dba68a0030313e27b8dd5da2076952629485f2d 720c7e2dd34822d33cb24a0a3f0f4bdabf433500 CI <CI@example.com> 1634896916 +1100 commit (merge): Merge branch 'master' of ../actual_remote diff --git a/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..4473fe625 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI <CI@example.com> 1634896911 +1100 fetch origin: storing head diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 Binary files differnew file mode 100644 index 000000000..7f2ebf4ee --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMergeConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 Binary files differnew file mode 100644 index 000000000..f74bf2335 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f b/test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f Binary files differnew file mode 100644 index 000000000..5fcd3c3ea --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMergeConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce Binary files differnew file mode 100644 index 000000000..0a734f981 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMergeConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 Binary files differnew file mode 100644 index 000000000..31ae3f5ba --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a b/test/integration/pullMergeConflict/expected/.git_keep/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a new file mode 100644 index 000000000..c7b25d78c --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a @@ -0,0 +1,3 @@ +xA +0@Q9E4i"BW=F:D#ŗ֥ytj'PH4!sL%D֞; +QJ趲2O5pAB6m(ٕw{ F ƻ~Jݞz<r9#3";1Oז259
\ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/72/0c7e2dd34822d33cb24a0a3f0f4bdabf433500 b/test/integration/pullMergeConflict/expected/.git_keep/objects/72/0c7e2dd34822d33cb24a0a3f0f4bdabf433500 Binary files differnew file mode 100644 index 000000000..a7ca5da80 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/72/0c7e2dd34822d33cb24a0a3f0f4bdabf433500 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/7d/ba68a0030313e27b8dd5da2076952629485f2d b/test/integration/pullMergeConflict/expected/.git_keep/objects/7d/ba68a0030313e27b8dd5da2076952629485f2d Binary files differnew file mode 100644 index 000000000..bbb1cce71 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/7d/ba68a0030313e27b8dd5da2076952629485f2d diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/80/f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 b/test/integration/pullMergeConflict/expected/.git_keep/objects/80/f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 Binary files differnew file mode 100644 index 000000000..c589d7b21 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/80/f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullMergeConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae Binary files differnew file mode 100644 index 000000000..13e3f581a --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMergeConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Binary files differnew file mode 100644 index 000000000..285df3e5f --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMergeConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 Binary files differnew file mode 100644 index 000000000..96d2e71a6 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullMergeConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 Binary files differnew file mode 100644 index 000000000..5a90eb5f9 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMergeConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 Binary files differnew file mode 100644 index 000000000..d39fa7d2f --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa b/test/integration/pullMergeConflict/expected/.git_keep/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa Binary files differnew file mode 100644 index 000000000..805becbe2 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMergeConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b Binary files differnew file mode 100644 index 000000000..9b771fc2f --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/f0/e8e7922de77a5ab20b924640c8b8435bae0b0b b/test/integration/pullMergeConflict/expected/.git_keep/objects/f0/e8e7922de77a5ab20b924640c8b8435bae0b0b new file mode 100644 index 000000000..16a061777 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/objects/f0/e8e7922de77a5ab20b924640c8b8435bae0b0b @@ -0,0 +1,2 @@ +xA +0@ѮsJFc<ƘL")#tyS5[ S5d"9`'XZLEҽsi4cG7jO@)DpEޝ4;uSt4M,
\ No newline at end of file diff --git a/test/integration/pullMergeConflict/expected/.git_keep/refs/heads/master b/test/integration/pullMergeConflict/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..1276860f9 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +720c7e2dd34822d33cb24a0a3f0f4bdabf433500 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..859a8b890 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +38699899bb94dfae74e3e55cf5bd6d92e6f3292a diff --git a/test/integration/pullMergeConflict/expected/myfile1 b/test/integration/pullMergeConflict/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/pullMergeConflict/expected/myfile2 b/test/integration/pullMergeConflict/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/pullMergeConflict/expected/myfile3 b/test/integration/pullMergeConflict/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/pullMergeConflict/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/pullMergeConflict/expected/myfile4 b/test/integration/pullMergeConflict/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/pullMergeConflict/expected/myfile4 @@ -0,0 +1 @@ +test4 |