From 2008c3951616f9b366b320e805dcbd0c5da6ce96 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 22 Oct 2021 20:18:40 +1100 Subject: [PATCH] add tests for dealing with remotes --- .gitignore | 4 +- pkg/gui/custom_commands_test.go | 63 +++++++++++++++ pkg/gui/gui_test.go | 60 +------------- pkg/integration/integration.go | 76 +++++++++++++++--- .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../forcePush/expected/.git_keep/FETCH_HEAD | 1 + .../forcePush/expected/.git_keep/HEAD | 1 + .../forcePush/expected/.git_keep/ORIG_HEAD | 1 + .../forcePush/expected/.git_keep/config | 16 ++++ .../forcePush/expected/.git_keep/description | 1 + .../forcePush/expected/.git_keep/index | Bin 0 -> 281 bytes .../forcePush/expected/.git_keep/info/exclude | 7 ++ .../forcePush/expected/.git_keep/logs/HEAD | 5 ++ .../expected/.git_keep/logs/refs/heads/master | 5 ++ .../.git_keep/logs/refs/remotes/origin/master | 3 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 | 5 ++ .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../66/bd8d357f6226ec264478db3606bc1c4be87e63 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../a9/848fd98935937cd7d3909023ed1b588ccd4bfb | Bin 0 -> 149 bytes .../ae/d1af42535c9c6a27b9f660119452328fddd7cd | 3 + .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 0 -> 103 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + test/integration/forcePush/expected/myfile1 | 1 + test/integration/forcePush/expected/myfile2 | 1 + test/integration/forcePush/expected/myfile4 | 1 + .../forcePush/expected_remote/HEAD | 1 + .../forcePush/expected_remote/config | 8 ++ .../forcePush/expected_remote/description | 1 + .../forcePush/expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 | 5 ++ .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../66/bd8d357f6226ec264478db3606bc1c4be87e63 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../a9/848fd98935937cd7d3909023ed1b588ccd4bfb | Bin 0 -> 149 bytes .../ae/d1af42535c9c6a27b9f660119452328fddd7cd | 3 + .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 0 -> 103 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../forcePush/expected_remote/packed-refs | 2 + .../expected_remote/refs/heads/master | 1 + test/integration/forcePush/recording.json | 1 + test/integration/forcePush/setup.sh | 39 +++++++++ test/integration/forcePush/test.json | 1 + .../pull/expected/.git_keep/COMMIT_EDITMSG | 1 + .../pull/expected/.git_keep/FETCH_HEAD | 1 + test/integration/pull/expected/.git_keep/HEAD | 1 + .../pull/expected/.git_keep/ORIG_HEAD | 1 + .../pull/expected/.git_keep/config | 16 ++++ .../pull/expected/.git_keep/description | 1 + .../integration/pull/expected/.git_keep/index | Bin 0 -> 353 bytes .../pull/expected/.git_keep/info/exclude | 7 ++ .../pull/expected/.git_keep/logs/HEAD | 6 ++ .../expected/.git_keep/logs/refs/heads/master | 6 ++ .../.git_keep/logs/refs/remotes/origin/master | 1 + .../00/3527daa0801470151d8f93140a02fc306fea00 | 2 + .../0c/0f210a4e5ff3b58e4190501c2b755695f439fa | Bin 0 -> 148 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a | Bin 0 -> 150 bytes .../6a/d6c42187d356f4eab4f004cca17863746adec1 | 2 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../pull/expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + test/integration/pull/expected/myfile1 | 1 + test/integration/pull/expected/myfile2 | 1 + test/integration/pull/expected/myfile3 | 1 + test/integration/pull/expected/myfile4 | 1 + test/integration/pull/expected_remote/HEAD | 1 + test/integration/pull/expected_remote/config | 8 ++ .../pull/expected_remote/description | 1 + .../pull/expected_remote/info/exclude | 7 ++ .../00/3527daa0801470151d8f93140a02fc306fea00 | 2 + .../0c/0f210a4e5ff3b58e4190501c2b755695f439fa | Bin 0 -> 148 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a | Bin 0 -> 150 bytes .../6a/d6c42187d356f4eab4f004cca17863746adec1 | 2 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../pull/expected_remote/packed-refs | 2 + test/integration/pull/recording.json | 1 + test/integration/pull/setup.sh | 34 ++++++++ test/integration/pull/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../pullMerge/expected/.git_keep/FETCH_HEAD | 1 + .../pullMerge/expected/.git_keep/HEAD | 1 + .../pullMerge/expected/.git_keep/ORIG_HEAD | 1 + .../pullMerge/expected/.git_keep/config | 18 +++++ .../pullMerge/expected/.git_keep/description | 1 + .../pullMerge/expected/.git_keep/index | Bin 0 -> 353 bytes .../pullMerge/expected/.git_keep/info/exclude | 7 ++ .../pullMerge/expected/.git_keep/logs/HEAD | 7 ++ .../expected/.git_keep/logs/refs/heads/master | 7 ++ .../.git_keep/logs/refs/remotes/origin/master | 1 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2a/0805355a8040f9eebfa2dbf70b8bc313d6f456 | Bin 0 -> 150 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../55/29eadf398ce89032744d5f4151000f07d70124 | 2 + .../70/3e85166069a42b4254af06b68dffc159ea3f24 | Bin 0 -> 150 bytes .../7c/0bda1656e7695870ed15839643564b0a9283a8 | 3 + .../7f/157a65ec0c8d6cffce08d6768e6733939e75a1 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../b1/0baba2f9d877322f94f8770e2e0c8ab1db6bcc | Bin 0 -> 204 bytes .../ce/0848710343a75263ea72cb5bdfa666b9ecda68 | Bin 0 -> 103 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + test/integration/pullMerge/expected/myfile1 | 1 + test/integration/pullMerge/expected/myfile2 | 1 + test/integration/pullMerge/expected/myfile3 | 1 + test/integration/pullMerge/expected/myfile4 | 1 + .../pullMerge/expected_remote/HEAD | 1 + .../pullMerge/expected_remote/config | 8 ++ .../pullMerge/expected_remote/description | 1 + .../pullMerge/expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../55/29eadf398ce89032744d5f4151000f07d70124 | 2 + .../70/3e85166069a42b4254af06b68dffc159ea3f24 | Bin 0 -> 150 bytes .../7c/0bda1656e7695870ed15839643564b0a9283a8 | 3 + .../7f/157a65ec0c8d6cffce08d6768e6733939e75a1 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../pullMerge/expected_remote/packed-refs | 2 + test/integration/pullMerge/recording.json | 1 + test/integration/pullMerge/setup.sh | 40 +++++++++ test/integration/pullMerge/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 25 ++++++ .../expected/.git_keep/FETCH_HEAD | 1 + .../pullMergeConflict/expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 18 +++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 425 bytes .../expected/.git_keep/info/exclude | 7 ++ .../expected/.git_keep/logs/HEAD | 7 ++ .../expected/.git_keep/logs/refs/heads/master | 7 ++ .../.git_keep/logs/refs/remotes/origin/master | 1 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1f/e5d8152187295b171f171c0d55d809500ae80f | Bin 0 -> 85 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../38/699899bb94dfae74e3e55cf5bd6d92e6f3292a | 3 + .../72/0c7e2dd34822d33cb24a0a3f0f4bdabf433500 | Bin 0 -> 204 bytes .../7d/ba68a0030313e27b8dd5da2076952629485f2d | Bin 0 -> 156 bytes .../80/f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 | Bin 0 -> 149 bytes .../9b/1719f5cf069568785080a0bbabbe7c377e22ae | Bin 0 -> 24 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../ae/d6c0a012c68a8b615ab0185b64f59c414d4746 | Bin 0 -> 103 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa | Bin 0 -> 149 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../f0/e8e7922de77a5ab20b924640c8b8435bae0b0b | 2 + .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + .../pullMergeConflict/expected/myfile1 | 1 + .../pullMergeConflict/expected/myfile2 | 1 + .../pullMergeConflict/expected/myfile3 | 1 + .../pullMergeConflict/expected/myfile4 | 1 + .../pullMergeConflict/expected_remote/HEAD | 1 + .../pullMergeConflict/expected_remote/config | 8 ++ .../expected_remote/description | 1 + .../expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../38/699899bb94dfae74e3e55cf5bd6d92e6f3292a | 3 + .../80/f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa | Bin 0 -> 149 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../f0/e8e7922de77a5ab20b924640c8b8435bae0b0b | 2 + .../expected_remote/packed-refs | 2 + .../pullMergeConflict/recording.json | 1 + test/integration/pullMergeConflict/setup.sh | 40 +++++++++ test/integration/pullMergeConflict/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../pullRebase/expected/.git_keep/FETCH_HEAD | 1 + .../pullRebase/expected/.git_keep/HEAD | 1 + .../pullRebase/expected/.git_keep/ORIG_HEAD | 1 + .../pullRebase/expected/.git_keep/config | 18 +++++ .../pullRebase/expected/.git_keep/description | 1 + .../pullRebase/expected/.git_keep/index | Bin 0 -> 425 bytes .../expected/.git_keep/info/exclude | 7 ++ .../pullRebase/expected/.git_keep/logs/HEAD | 9 +++ .../expected/.git_keep/logs/refs/heads/master | 7 ++ .../.git_keep/logs/refs/remotes/origin/master | 1 + .../0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 | Bin 0 -> 148 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../74/755f34462bd712c676b84247831233da97a272 | Bin 0 -> 154 bytes .../7b/21277988b03a5fd9e933126e8d1f31d2498d08 | 2 + .../92/c2dd111eeb7daf4a0e30faff73b9441103805d | Bin 0 -> 103 bytes .../98/fea3de076a474cabfac7130669625879051d43 | Bin 0 -> 134 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../c0/ae07711df69fb0a21efaca9d63da42a67eaedf | 2 + .../d0/e04b2bced3bc76f0abf50698a7ab774cd54568 | 3 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../fe/1d53ca86366f64f689586cb0fe243fed1d1482 | Bin 0 -> 149 bytes .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + test/integration/pullRebase/expected/myfile1 | 1 + test/integration/pullRebase/expected/myfile2 | 1 + test/integration/pullRebase/expected/myfile3 | 1 + test/integration/pullRebase/expected/myfile4 | 1 + test/integration/pullRebase/expected/myfile5 | 1 + .../pullRebase/expected_remote/HEAD | 1 + .../pullRebase/expected_remote/config | 8 ++ .../pullRebase/expected_remote/description | 1 + .../pullRebase/expected_remote/info/exclude | 7 ++ .../0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 | Bin 0 -> 148 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../c0/ae07711df69fb0a21efaca9d63da42a67eaedf | 2 + .../d0/e04b2bced3bc76f0abf50698a7ab774cd54568 | 3 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../fe/1d53ca86366f64f689586cb0fe243fed1d1482 | Bin 0 -> 149 bytes .../pullRebase/expected_remote/packed-refs | 2 + test/integration/pullRebase/recording.json | 1 + test/integration/pullRebase/setup.sh | 40 +++++++++ test/integration/pullRebase/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 1 + .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 18 +++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 425 bytes .../expected/.git_keep/info/exclude | 7 ++ .../expected/.git_keep/logs/HEAD | 9 +++ .../expected/.git_keep/logs/refs/heads/master | 7 ++ .../.git_keep/logs/refs/remotes/origin/master | 1 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../10/3c3eb899d173b83fc1b40261c8880fef359cc3 | Bin 0 -> 149 bytes .../11/6cef0e366265c3d002cdb3dce4e285e32b5d12 | Bin 0 -> 157 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../34/574474ac6f7dd2d3142bc28ee39db88d8a16af | 2 + .../3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da | Bin 0 -> 149 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 0 -> 15 bytes .../9b/1719f5cf069568785080a0bbabbe7c377e22ae | Bin 0 -> 24 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 | Bin 0 -> 150 bytes .../ae/d6c0a012c68a8b615ab0185b64f59c414d4746 | Bin 0 -> 103 bytes .../b2/da3d615a1805f094849247add77d09aee06451 | Bin 0 -> 128 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../db/7122c7f62714dfa854d8d22b2081d308912af8 | Bin 0 -> 159 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e6/1e2c991de853082420fd27fd983098afd4c0c8 | Bin 0 -> 56 bytes .../e6/9912eb1649ce8dbb33678796cec3e89da3675d | Bin 0 -> 52 bytes .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + .../pullRebaseConflict/expected/myfile1 | 1 + .../pullRebaseConflict/expected/myfile2 | 1 + .../pullRebaseConflict/expected/myfile3 | 1 + .../pullRebaseConflict/expected/myfile4 | 1 + .../pullRebaseConflict/expected_remote/HEAD | 1 + .../pullRebaseConflict/expected_remote/config | 8 ++ .../expected_remote/description | 1 + .../expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../10/3c3eb899d173b83fc1b40261c8880fef359cc3 | Bin 0 -> 149 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../34/574474ac6f7dd2d3142bc28ee39db88d8a16af | 2 + .../3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 | Bin 0 -> 150 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected_remote/packed-refs | 2 + .../pullRebaseConflict/recording.json | 1 + test/integration/pullRebaseConflict/setup.sh | 40 +++++++++ test/integration/pullRebaseConflict/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 16 ++++ .../expected/.git_keep/FETCH_HEAD | 1 + .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 18 +++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 550 bytes .../expected/.git_keep/info/exclude | 7 ++ .../expected/.git_keep/logs/HEAD | 15 ++++ .../expected/.git_keep/logs/refs/heads/master | 10 +++ .../.git_keep/logs/refs/remotes/origin/master | 1 + .../00/a0b67048be84a6aeaa50b27ad90ab567d65837 | Bin 0 -> 129 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../24/21815f8570a34d9f8c8991df1005150ed3ae99 | Bin 0 -> 160 bytes .../29/daf999882c9e60c6b6a2868913a6cfd856d620 | Bin 0 -> 159 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../3f/b33027aedae13ab0796292c821a0258f6c2f7b | Bin 0 -> 150 bytes .../42/3f7757eb2eea3de217b54447a94820af933d3a | 5 ++ .../5c/32741b468f0ab8ddd243e9871dcc8dec5c35f9 | Bin 0 -> 148 bytes .../5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 | Bin 0 -> 138 bytes .../74/ca3dec707dde7c92727d9490517e498360fea8 | 2 + .../89/ee54b2ed7aff7c3aae24f64be85568f9a9d329 | Bin 0 -> 144 bytes .../8c/fc761d2799512553e491f7ceb3564a5e994999 | Bin 0 -> 134 bytes .../91/47ce4817b84339d884cee1683f361fd3aa4696 | Bin 0 -> 144 bytes .../9b/1719f5cf069568785080a0bbabbe7c377e22ae | Bin 0 -> 24 bytes .../9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 | Bin 0 -> 20 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../ae/d6c0a012c68a8b615ab0185b64f59c414d4746 | Bin 0 -> 103 bytes .../b2/da3d615a1805f094849247add77d09aee06451 | Bin 0 -> 128 bytes .../b8/9e837219d9a8aceb8b0f13381be0afb0dac427 | Bin 0 -> 67 bytes .../bf/4fb489636d4bde42e478b04cbdcc079dcd0183 | Bin 0 -> 147 bytes .../ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 | Bin 0 -> 150 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e | Bin 0 -> 163 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e2/251a5b6d32bf5fc57f234946e3fabeba3b5cca | Bin 0 -> 143 bytes .../ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa | 2 + .../ef/bb36c97316886b089b1b27233cd8bfdc37ed4a | 2 + .../f0/bbe52a52883609acdb825c8af32b4b3ccb0607 | Bin 0 -> 154 bytes .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + .../pullRebaseInteractive/expected/myfile1 | 1 + .../pullRebaseInteractive/expected/myfile2 | 1 + .../pullRebaseInteractive/expected/myfile3 | 1 + .../pullRebaseInteractive/expected/myfile4 | 1 + .../pullRebaseInteractive/expected/myfile5 | 1 + .../pullRebaseInteractive/expected/myfile6 | 1 + .../pullRebaseInteractive/expected/myfile7 | 1 + .../expected_remote/HEAD | 1 + .../expected_remote/config | 8 ++ .../expected_remote/description | 1 + .../expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../3f/b33027aedae13ab0796292c821a0258f6c2f7b | Bin 0 -> 150 bytes .../74/ca3dec707dde7c92727d9490517e498360fea8 | 2 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 | Bin 0 -> 150 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa | 2 + .../expected_remote/packed-refs | 2 + .../pullRebaseInteractive/recording.json | 1 + .../pullRebaseInteractive/setup.sh | 52 ++++++++++++ .../pullRebaseInteractive/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 16 ++++ .../expected/.git_keep/FETCH_HEAD | 1 + .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/ORIG_HEAD | 1 + .../expected/.git_keep/config | 18 +++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 550 bytes .../expected/.git_keep/info/exclude | 7 ++ .../expected/.git_keep/logs/HEAD | 14 ++++ .../expected/.git_keep/logs/refs/heads/master | 10 +++ .../.git_keep/logs/refs/remotes/origin/master | 1 + .../00/a0b67048be84a6aeaa50b27ad90ab567d65837 | Bin 0 -> 129 bytes .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../0f/a53867500c0f3a5cca9b2112982795fae51c51 | Bin 0 -> 144 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../26/02a2a5727666c205fef7f152786e1edb1c5d4b | Bin 0 -> 160 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../45/89efcaf3024e841825bb289bb88eb0e4f8530a | 2 + .../47/6a1939075b60aa47da50a8c40c5b4412a2f18b | Bin 0 -> 149 bytes .../57/59b6258419271e67a172e51cd90048dd21f9c0 | 3 + .../5d/08d9b6315ddb8fb8372d83b54862ba7d7fdc88 | 2 + .../5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 | Bin 0 -> 138 bytes .../65/401620c5230dfa2ad6e0e2dcb6b447fe21262b | Bin 0 -> 67 bytes .../69/a5c9fb912112305bfe15272855afb50f6acf4b | Bin 0 -> 143 bytes .../7c/717449332e4a81f7e5643eef9c95f459444e3f | 3 + .../8c/fc761d2799512553e491f7ceb3564a5e994999 | Bin 0 -> 134 bytes .../90/13b5f12ca8a0fdd44fbe72028500bbac5c89ee | Bin 0 -> 156 bytes .../9b/1719f5cf069568785080a0bbabbe7c377e22ae | Bin 0 -> 24 bytes .../9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 | Bin 0 -> 20 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../ae/4e33d43751b83fbd0b6f0a1796d58462492e47 | 2 + .../ae/d6c0a012c68a8b615ab0185b64f59c414d4746 | Bin 0 -> 103 bytes .../af/4c4b2b977f8909e590ea5bc3bab59d991e4c28 | Bin 0 -> 144 bytes .../b2/da3d615a1805f094849247add77d09aee06451 | Bin 0 -> 128 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e0/47462bda495acbe565c85b205d614f38c0a692 | Bin 0 -> 150 bytes .../f0/bbe52a52883609acdb825c8af32b4b3ccb0607 | Bin 0 -> 154 bytes .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + .../expected/myfile1 | 1 + .../expected/myfile2 | 1 + .../expected/myfile3 | 1 + .../expected/myfile4 | 1 + .../expected/myfile5 | 1 + .../expected/myfile7 | 1 + .../expected_remote/HEAD | 1 + .../expected_remote/config | 8 ++ .../expected_remote/description | 1 + .../expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../45/89efcaf3024e841825bb289bb88eb0e4f8530a | 2 + .../47/6a1939075b60aa47da50a8c40c5b4412a2f18b | Bin 0 -> 149 bytes .../57/59b6258419271e67a172e51cd90048dd21f9c0 | 3 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e0/47462bda495acbe565c85b205d614f38c0a692 | Bin 0 -> 150 bytes .../expected_remote/packed-refs | 2 + .../recording.json | 1 + .../pullRebaseInteractiveWithDrop/setup.sh | 52 ++++++++++++ .../pullRebaseInteractiveWithDrop/test.json | 1 + .../push/expected/.git_keep/COMMIT_EDITMSG | 1 + .../push/expected/.git_keep/FETCH_HEAD | 1 + test/integration/push/expected/.git_keep/HEAD | 1 + .../push/expected/.git_keep/config | 16 ++++ .../push/expected/.git_keep/description | 1 + .../integration/push/expected/.git_keep/index | Bin 0 -> 353 bytes .../push/expected/.git_keep/info/exclude | 7 ++ .../push/expected/.git_keep/logs/HEAD | 4 + .../expected/.git_keep/logs/refs/heads/master | 4 + .../.git_keep/logs/refs/remotes/origin/master | 2 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../54/7f41a06ebd3bee30fbba3f43631810fa24f1bb | Bin 0 -> 150 bytes .../a0/9547e07257ed0456f498fde1b8214152427384 | 2 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a6/e580c7c3c4ea40bc311466d57a946bb3f77541 | 4 + .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../eb/831bc1251f71f602159d98f4550e380007ca4f | 2 + .../push/expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + test/integration/push/expected/myfile1 | 1 + test/integration/push/expected/myfile2 | 1 + test/integration/push/expected/myfile3 | 1 + test/integration/push/expected/myfile4 | 1 + test/integration/push/expected_remote/HEAD | 1 + test/integration/push/expected_remote/config | 8 ++ .../push/expected_remote/description | 1 + .../push/expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../54/7f41a06ebd3bee30fbba3f43631810fa24f1bb | Bin 0 -> 150 bytes .../a0/9547e07257ed0456f498fde1b8214152427384 | 2 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a6/e580c7c3c4ea40bc311466d57a946bb3f77541 | 4 + .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../eb/831bc1251f71f602159d98f4550e380007ca4f | 2 + .../push/expected_remote/packed-refs | 2 + .../push/expected_remote/refs/heads/master | 1 + test/integration/push/recording.json | 1 + test/integration/push/setup.sh | 33 ++++++++ test/integration/push/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 1 + .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/config | 18 +++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 7 ++ .../expected/.git_keep/logs/HEAD | 5 ++ .../expected/.git_keep/logs/refs/heads/master | 4 + .../expected/.git_keep/logs/refs/heads/test | 1 + .../.git_keep/logs/refs/remotes/origin/master | 1 + .../.git_keep/logs/refs/remotes/origin/test | 1 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../65/c52315dc238c164b914369f49bd70882cc1d85 | Bin 0 -> 121 bytes .../70/7a2a0835c897496934849bf6e0815593b140b3 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../da/b77371cf53420955fc9baeb84303414f7e4a60 | Bin 0 -> 150 bytes .../db/d679941d871665b7ff70fffe6116725e56e270 | Bin 0 -> 149 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected/.git_keep/refs/heads/master | 1 + .../expected/.git_keep/refs/heads/test | 1 + .../.git_keep/refs/remotes/origin/master | 1 + .../.git_keep/refs/remotes/origin/test | 1 + .../pushAndSetUpstream/expected/myfile1 | 1 + .../pushAndSetUpstream/expected/myfile2 | 1 + .../pushAndSetUpstream/expected/myfile3 | 1 + .../pushAndSetUpstream/expected/myfile4 | 1 + .../pushAndSetUpstream/expected_remote/HEAD | 1 + .../pushAndSetUpstream/expected_remote/config | 8 ++ .../expected_remote/description | 1 + .../expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../65/c52315dc238c164b914369f49bd70882cc1d85 | Bin 0 -> 121 bytes .../70/7a2a0835c897496934849bf6e0815593b140b3 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../da/b77371cf53420955fc9baeb84303414f7e4a60 | Bin 0 -> 150 bytes .../db/d679941d871665b7ff70fffe6116725e56e270 | Bin 0 -> 149 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected_remote/packed-refs | 2 + .../expected_remote/refs/heads/test | 1 + .../pushAndSetUpstream/recording.json | 1 + test/integration/pushAndSetUpstream/setup.sh | 33 ++++++++ test/integration/pushAndSetUpstream/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../expected/.git_keep/FETCH_HEAD | 1 + .../expected/.git_keep/HEAD | 1 + .../expected/.git_keep/config | 18 +++++ .../expected/.git_keep/description | 1 + .../expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 7 ++ .../expected/.git_keep/logs/HEAD | 5 ++ .../expected/.git_keep/logs/refs/heads/master | 4 + .../expected/.git_keep/logs/refs/heads/test | 1 + .../.git_keep/logs/refs/remotes/origin/master | 1 + .../.git_keep/logs/refs/remotes/origin/test | 1 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2d/0011f18dcd00e21fd13ede01792048ccd09e85 | Bin 0 -> 150 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d0/e2575d4cdf78f6845db57439c7b526d02dbc7d | 2 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../dc/7117cc68b23798cabb2c388a45036da33c2f10 | Bin 0 -> 150 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected/.git_keep/refs/heads/master | 1 + .../expected/.git_keep/refs/heads/test | 1 + .../.git_keep/refs/remotes/origin/master | 1 + .../.git_keep/refs/remotes/origin/test | 1 + .../expected/myfile1 | 1 + .../expected/myfile2 | 1 + .../expected/myfile3 | 1 + .../expected/myfile4 | 1 + .../expected_remote/HEAD | 1 + .../expected_remote/config | 8 ++ .../expected_remote/description | 1 + .../expected_remote/info/exclude | 7 ++ .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2d/0011f18dcd00e21fd13ede01792048ccd09e85 | Bin 0 -> 150 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 | Bin 0 -> 149 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d0/e2575d4cdf78f6845db57439c7b526d02dbc7d | 2 + .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../dc/7117cc68b23798cabb2c388a45036da33c2f10 | Bin 0 -> 150 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected_remote/packed-refs | 2 + .../expected_remote/refs/heads/test | 1 + .../pushAndSetUpstreamDefault/recording.json | 1 + .../pushAndSetUpstreamDefault/setup.sh | 33 ++++++++ .../pushAndSetUpstreamDefault/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../setUpstream/expected/.git_keep/FETCH_HEAD | 1 + .../setUpstream/expected/.git_keep/HEAD | 1 + .../setUpstream/expected/.git_keep/ORIG_HEAD | 1 + .../setUpstream/expected/.git_keep/config | 16 ++++ .../expected/.git_keep/description | 1 + .../setUpstream/expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 7 ++ .../setUpstream/expected/.git_keep/logs/HEAD | 6 ++ .../expected/.git_keep/logs/refs/heads/master | 6 ++ .../.git_keep/logs/refs/remotes/origin/master | 1 + .../05/8c8904c25889dd77ee3e817325fd1a28134037 | 2 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b | 3 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../40/9dd039b9ec270067678ae23b710c8e4c49c458 | 3 + .../7d/7da1f440cca8d28eaf4b46e63f207993562b84 | 3 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../expected/.git_keep/refs/heads/master | 1 + .../.git_keep/refs/remotes/origin/master | 1 + test/integration/setUpstream/expected/myfile1 | 1 + test/integration/setUpstream/expected/myfile2 | 1 + test/integration/setUpstream/expected/myfile3 | 1 + test/integration/setUpstream/expected/myfile4 | 1 + .../setUpstream/expected_remote/HEAD | 1 + .../setUpstream/expected_remote/config | 8 ++ .../setUpstream/expected_remote/description | 1 + .../setUpstream/expected_remote/info/exclude | 7 ++ .../05/8c8904c25889dd77ee3e817325fd1a28134037 | 2 + .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 0 -> 52 bytes .../14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b | 3 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 0 -> 103 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 0 -> 128 bytes .../40/9dd039b9ec270067678ae23b710c8e4c49c458 | 3 + .../7d/7da1f440cca8d28eaf4b46e63f207993562b84 | 3 + .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 0 -> 77 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../setUpstream/expected_remote/packed-refs | 2 + test/integration/setUpstream/recording.json | 1 + test/integration/setUpstream/setup.sh | 30 +++++++ test/integration/setUpstream/test.json | 1 + test/runner/main.go | 4 +- 663 files changed, 1663 insertions(+), 72 deletions(-) create mode 100644 pkg/gui/custom_commands_test.go create mode 100644 test/integration/forcePush/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/forcePush/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/forcePush/expected/.git_keep/HEAD create mode 100644 test/integration/forcePush/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/forcePush/expected/.git_keep/config create mode 100644 test/integration/forcePush/expected/.git_keep/description create mode 100644 test/integration/forcePush/expected/.git_keep/index create mode 100644 test/integration/forcePush/expected/.git_keep/info/exclude create mode 100644 test/integration/forcePush/expected/.git_keep/logs/HEAD create mode 100644 test/integration/forcePush/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/forcePush/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/forcePush/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/forcePush/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/forcePush/expected/.git_keep/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 create mode 100644 test/integration/forcePush/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/forcePush/expected/.git_keep/objects/66/bd8d357f6226ec264478db3606bc1c4be87e63 create mode 100644 test/integration/forcePush/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/forcePush/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/forcePush/expected/.git_keep/objects/a9/848fd98935937cd7d3909023ed1b588ccd4bfb create mode 100644 test/integration/forcePush/expected/.git_keep/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd create mode 100644 test/integration/forcePush/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 create mode 100644 test/integration/forcePush/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/forcePush/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/forcePush/expected/.git_keep/refs/heads/master create mode 100644 test/integration/forcePush/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/forcePush/expected/myfile1 create mode 100644 test/integration/forcePush/expected/myfile2 create mode 100644 test/integration/forcePush/expected/myfile4 create mode 100644 test/integration/forcePush/expected_remote/HEAD create mode 100644 test/integration/forcePush/expected_remote/config create mode 100644 test/integration/forcePush/expected_remote/description create mode 100644 test/integration/forcePush/expected_remote/info/exclude create mode 100644 test/integration/forcePush/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/forcePush/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/forcePush/expected_remote/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 create mode 100644 test/integration/forcePush/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/forcePush/expected_remote/objects/66/bd8d357f6226ec264478db3606bc1c4be87e63 create mode 100644 test/integration/forcePush/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/forcePush/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/forcePush/expected_remote/objects/a9/848fd98935937cd7d3909023ed1b588ccd4bfb create mode 100644 test/integration/forcePush/expected_remote/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd create mode 100644 test/integration/forcePush/expected_remote/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 create mode 100644 test/integration/forcePush/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/forcePush/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/forcePush/expected_remote/packed-refs create mode 100644 test/integration/forcePush/expected_remote/refs/heads/master create mode 100644 test/integration/forcePush/recording.json create mode 100644 test/integration/forcePush/setup.sh create mode 100644 test/integration/forcePush/test.json create mode 100644 test/integration/pull/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pull/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pull/expected/.git_keep/HEAD create mode 100644 test/integration/pull/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/pull/expected/.git_keep/config create mode 100644 test/integration/pull/expected/.git_keep/description create mode 100644 test/integration/pull/expected/.git_keep/index create mode 100644 test/integration/pull/expected/.git_keep/info/exclude create mode 100644 test/integration/pull/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pull/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pull/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pull/expected/.git_keep/objects/00/3527daa0801470151d8f93140a02fc306fea00 create mode 100644 test/integration/pull/expected/.git_keep/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa create mode 100644 test/integration/pull/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pull/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pull/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pull/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pull/expected/.git_keep/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a create mode 100644 test/integration/pull/expected/.git_keep/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 create mode 100644 test/integration/pull/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pull/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pull/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pull/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pull/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pull/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pull/expected/myfile1 create mode 100644 test/integration/pull/expected/myfile2 create mode 100644 test/integration/pull/expected/myfile3 create mode 100644 test/integration/pull/expected/myfile4 create mode 100644 test/integration/pull/expected_remote/HEAD create mode 100644 test/integration/pull/expected_remote/config create mode 100644 test/integration/pull/expected_remote/description create mode 100644 test/integration/pull/expected_remote/info/exclude create mode 100644 test/integration/pull/expected_remote/objects/00/3527daa0801470151d8f93140a02fc306fea00 create mode 100644 test/integration/pull/expected_remote/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa create mode 100644 test/integration/pull/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pull/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pull/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pull/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pull/expected_remote/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a create mode 100644 test/integration/pull/expected_remote/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 create mode 100644 test/integration/pull/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pull/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pull/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pull/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pull/expected_remote/packed-refs create mode 100644 test/integration/pull/recording.json create mode 100644 test/integration/pull/setup.sh create mode 100644 test/integration/pull/test.json create mode 100644 test/integration/pullMerge/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pullMerge/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pullMerge/expected/.git_keep/HEAD create mode 100644 test/integration/pullMerge/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/pullMerge/expected/.git_keep/config create mode 100644 test/integration/pullMerge/expected/.git_keep/description create mode 100644 test/integration/pullMerge/expected/.git_keep/index create mode 100644 test/integration/pullMerge/expected/.git_keep/info/exclude create mode 100644 test/integration/pullMerge/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pullMerge/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pullMerge/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/2a/0805355a8040f9eebfa2dbf70b8bc313d6f456 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/55/29eadf398ce89032744d5f4151000f07d70124 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/b1/0baba2f9d877322f94f8770e2e0c8ab1db6bcc create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullMerge/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullMerge/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pullMerge/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pullMerge/expected/myfile1 create mode 100644 test/integration/pullMerge/expected/myfile2 create mode 100644 test/integration/pullMerge/expected/myfile3 create mode 100644 test/integration/pullMerge/expected/myfile4 create mode 100644 test/integration/pullMerge/expected_remote/HEAD create mode 100644 test/integration/pullMerge/expected_remote/config create mode 100644 test/integration/pullMerge/expected_remote/description create mode 100644 test/integration/pullMerge/expected_remote/info/exclude create mode 100644 test/integration/pullMerge/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullMerge/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullMerge/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullMerge/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullMerge/expected_remote/objects/55/29eadf398ce89032744d5f4151000f07d70124 create mode 100644 test/integration/pullMerge/expected_remote/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 create mode 100644 test/integration/pullMerge/expected_remote/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 create mode 100644 test/integration/pullMerge/expected_remote/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 create mode 100644 test/integration/pullMerge/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullMerge/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullMerge/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullMerge/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullMerge/expected_remote/packed-refs create mode 100644 test/integration/pullMerge/recording.json create mode 100644 test/integration/pullMerge/setup.sh create mode 100644 test/integration/pullMerge/test.json create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/HEAD create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/config create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/description create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/index create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/info/exclude create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/72/0c7e2dd34822d33cb24a0a3f0f4bdabf433500 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/7d/ba68a0030313e27b8dd5da2076952629485f2d create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/80/f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/objects/f0/e8e7922de77a5ab20b924640c8b8435bae0b0b create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pullMergeConflict/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pullMergeConflict/expected/myfile1 create mode 100644 test/integration/pullMergeConflict/expected/myfile2 create mode 100644 test/integration/pullMergeConflict/expected/myfile3 create mode 100644 test/integration/pullMergeConflict/expected/myfile4 create mode 100644 test/integration/pullMergeConflict/expected_remote/HEAD create mode 100644 test/integration/pullMergeConflict/expected_remote/config create mode 100644 test/integration/pullMergeConflict/expected_remote/description create mode 100644 test/integration/pullMergeConflict/expected_remote/info/exclude create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/80/f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullMergeConflict/expected_remote/objects/f0/e8e7922de77a5ab20b924640c8b8435bae0b0b create mode 100644 test/integration/pullMergeConflict/expected_remote/packed-refs create mode 100644 test/integration/pullMergeConflict/recording.json create mode 100644 test/integration/pullMergeConflict/setup.sh create mode 100644 test/integration/pullMergeConflict/test.json create mode 100644 test/integration/pullRebase/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pullRebase/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pullRebase/expected/.git_keep/HEAD create mode 100644 test/integration/pullRebase/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/pullRebase/expected/.git_keep/config create mode 100644 test/integration/pullRebase/expected/.git_keep/description create mode 100644 test/integration/pullRebase/expected/.git_keep/index create mode 100644 test/integration/pullRebase/expected/.git_keep/info/exclude create mode 100644 test/integration/pullRebase/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pullRebase/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pullRebase/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/74/755f34462bd712c676b84247831233da97a272 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/7b/21277988b03a5fd9e933126e8d1f31d2498d08 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullRebase/expected/.git_keep/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 create mode 100644 test/integration/pullRebase/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pullRebase/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pullRebase/expected/myfile1 create mode 100644 test/integration/pullRebase/expected/myfile2 create mode 100644 test/integration/pullRebase/expected/myfile3 create mode 100644 test/integration/pullRebase/expected/myfile4 create mode 100644 test/integration/pullRebase/expected/myfile5 create mode 100644 test/integration/pullRebase/expected_remote/HEAD create mode 100644 test/integration/pullRebase/expected_remote/config create mode 100644 test/integration/pullRebase/expected_remote/description create mode 100644 test/integration/pullRebase/expected_remote/info/exclude create mode 100644 test/integration/pullRebase/expected_remote/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 create mode 100644 test/integration/pullRebase/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullRebase/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullRebase/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullRebase/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullRebase/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullRebase/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullRebase/expected_remote/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf create mode 100644 test/integration/pullRebase/expected_remote/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 create mode 100644 test/integration/pullRebase/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullRebase/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullRebase/expected_remote/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 create mode 100644 test/integration/pullRebase/expected_remote/packed-refs create mode 100644 test/integration/pullRebase/recording.json create mode 100644 test/integration/pullRebase/setup.sh create mode 100644 test/integration/pullRebase/test.json create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/HEAD create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/config create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/description create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/index create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/info/exclude create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/10/3c3eb899d173b83fc1b40261c8880fef359cc3 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/11/6cef0e366265c3d002cdb3dce4e285e32b5d12 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/db/7122c7f62714dfa854d8d22b2081d308912af8 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pullRebaseConflict/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pullRebaseConflict/expected/myfile1 create mode 100644 test/integration/pullRebaseConflict/expected/myfile2 create mode 100644 test/integration/pullRebaseConflict/expected/myfile3 create mode 100644 test/integration/pullRebaseConflict/expected/myfile4 create mode 100644 test/integration/pullRebaseConflict/expected_remote/HEAD create mode 100644 test/integration/pullRebaseConflict/expected_remote/config create mode 100644 test/integration/pullRebaseConflict/expected_remote/description create mode 100644 test/integration/pullRebaseConflict/expected_remote/info/exclude create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/10/3c3eb899d173b83fc1b40261c8880fef359cc3 create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullRebaseConflict/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullRebaseConflict/expected_remote/packed-refs create mode 100644 test/integration/pullRebaseConflict/recording.json create mode 100644 test/integration/pullRebaseConflict/setup.sh create mode 100644 test/integration/pullRebaseConflict/test.json create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/HEAD create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/config create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/description create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/index create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/info/exclude create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/29/daf999882c9e60c6b6a2868913a6cfd856d620 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/42/3f7757eb2eea3de217b54447a94820af933d3a create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/5c/32741b468f0ab8ddd243e9871dcc8dec5c35f9 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/74/ca3dec707dde7c92727d9490517e498360fea8 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/89/ee54b2ed7aff7c3aae24f64be85568f9a9d329 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/91/47ce4817b84339d884cee1683f361fd3aa4696 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/b8/9e837219d9a8aceb8b0f13381be0afb0dac427 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/bf/4fb489636d4bde42e478b04cbdcc079dcd0183 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/e2/251a5b6d32bf5fc57f234946e3fabeba3b5cca create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/ef/bb36c97316886b089b1b27233cd8bfdc37ed4a create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pullRebaseInteractive/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pullRebaseInteractive/expected/myfile1 create mode 100644 test/integration/pullRebaseInteractive/expected/myfile2 create mode 100644 test/integration/pullRebaseInteractive/expected/myfile3 create mode 100644 test/integration/pullRebaseInteractive/expected/myfile4 create mode 100644 test/integration/pullRebaseInteractive/expected/myfile5 create mode 100644 test/integration/pullRebaseInteractive/expected/myfile6 create mode 100644 test/integration/pullRebaseInteractive/expected/myfile7 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/HEAD create mode 100644 test/integration/pullRebaseInteractive/expected_remote/config create mode 100644 test/integration/pullRebaseInteractive/expected_remote/description create mode 100644 test/integration/pullRebaseInteractive/expected_remote/info/exclude create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/74/ca3dec707dde7c92727d9490517e498360fea8 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullRebaseInteractive/expected_remote/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa create mode 100644 test/integration/pullRebaseInteractive/expected_remote/packed-refs create mode 100644 test/integration/pullRebaseInteractive/recording.json create mode 100644 test/integration/pullRebaseInteractive/setup.sh create mode 100644 test/integration/pullRebaseInteractive/test.json create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/HEAD create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/config create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/description create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/index create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/info/exclude create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0f/a53867500c0f3a5cca9b2112982795fae51c51 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/08d9b6315ddb8fb8372d83b54862ba7d7fdc88 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/65/401620c5230dfa2ad6e0e2dcb6b447fe21262b create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/69/a5c9fb912112305bfe15272855afb50f6acf4b create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/7c/717449332e4a81f7e5643eef9c95f459444e3f create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/90/13b5f12ca8a0fdd44fbe72028500bbac5c89ee create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/ae/4e33d43751b83fbd0b6f0a1796d58462492e47 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/af/4c4b2b977f8909e590ea5bc3bab59d991e4c28 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/e0/47462bda495acbe565c85b205d614f38c0a692 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/myfile1 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/myfile2 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/myfile3 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/myfile4 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/myfile5 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected/myfile7 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/HEAD create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/config create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/description create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/info/exclude create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/e0/47462bda495acbe565c85b205d614f38c0a692 create mode 100644 test/integration/pullRebaseInteractiveWithDrop/expected_remote/packed-refs create mode 100644 test/integration/pullRebaseInteractiveWithDrop/recording.json create mode 100644 test/integration/pullRebaseInteractiveWithDrop/setup.sh create mode 100644 test/integration/pullRebaseInteractiveWithDrop/test.json create mode 100644 test/integration/push/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/push/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/push/expected/.git_keep/HEAD create mode 100644 test/integration/push/expected/.git_keep/config create mode 100644 test/integration/push/expected/.git_keep/description create mode 100644 test/integration/push/expected/.git_keep/index create mode 100644 test/integration/push/expected/.git_keep/info/exclude create mode 100644 test/integration/push/expected/.git_keep/logs/HEAD create mode 100644 test/integration/push/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/push/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/push/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/push/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/push/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/push/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/push/expected/.git_keep/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb create mode 100644 test/integration/push/expected/.git_keep/objects/a0/9547e07257ed0456f498fde1b8214152427384 create mode 100644 test/integration/push/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/push/expected/.git_keep/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 create mode 100644 test/integration/push/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/push/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/push/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/push/expected/.git_keep/objects/eb/831bc1251f71f602159d98f4550e380007ca4f create mode 100644 test/integration/push/expected/.git_keep/refs/heads/master create mode 100644 test/integration/push/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/push/expected/myfile1 create mode 100644 test/integration/push/expected/myfile2 create mode 100644 test/integration/push/expected/myfile3 create mode 100644 test/integration/push/expected/myfile4 create mode 100644 test/integration/push/expected_remote/HEAD create mode 100644 test/integration/push/expected_remote/config create mode 100644 test/integration/push/expected_remote/description create mode 100644 test/integration/push/expected_remote/info/exclude create mode 100644 test/integration/push/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/push/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/push/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/push/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/push/expected_remote/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb create mode 100644 test/integration/push/expected_remote/objects/a0/9547e07257ed0456f498fde1b8214152427384 create mode 100644 test/integration/push/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/push/expected_remote/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 create mode 100644 test/integration/push/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/push/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/push/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/push/expected_remote/objects/eb/831bc1251f71f602159d98f4550e380007ca4f create mode 100644 test/integration/push/expected_remote/packed-refs create mode 100644 test/integration/push/expected_remote/refs/heads/master create mode 100644 test/integration/push/recording.json create mode 100644 test/integration/push/setup.sh create mode 100644 test/integration/push/test.json create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/HEAD create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/config create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/description create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/index create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/info/exclude create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/test create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/test create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/65/c52315dc238c164b914369f49bd70882cc1d85 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/70/7a2a0835c897496934849bf6e0815593b140b3 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/db/d679941d871665b7ff70fffe6116725e56e270 create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/test create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/test create mode 100644 test/integration/pushAndSetUpstream/expected/myfile1 create mode 100644 test/integration/pushAndSetUpstream/expected/myfile2 create mode 100644 test/integration/pushAndSetUpstream/expected/myfile3 create mode 100644 test/integration/pushAndSetUpstream/expected/myfile4 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/HEAD create mode 100644 test/integration/pushAndSetUpstream/expected_remote/config create mode 100644 test/integration/pushAndSetUpstream/expected_remote/description create mode 100644 test/integration/pushAndSetUpstream/expected_remote/info/exclude create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/65/c52315dc238c164b914369f49bd70882cc1d85 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/70/7a2a0835c897496934849bf6e0815593b140b3 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/db/d679941d871665b7ff70fffe6116725e56e270 create mode 100644 test/integration/pushAndSetUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pushAndSetUpstream/expected_remote/packed-refs create mode 100644 test/integration/pushAndSetUpstream/expected_remote/refs/heads/test create mode 100644 test/integration/pushAndSetUpstream/recording.json create mode 100644 test/integration/pushAndSetUpstream/setup.sh create mode 100644 test/integration/pushAndSetUpstream/test.json create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/HEAD create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/config create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/description create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/index create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/info/exclude create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/HEAD create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/test create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/test create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/master create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/test create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/test create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/myfile1 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/myfile2 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/myfile3 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected/myfile4 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/HEAD create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/config create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/description create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/info/exclude create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/packed-refs create mode 100644 test/integration/pushAndSetUpstreamDefault/expected_remote/refs/heads/test create mode 100644 test/integration/pushAndSetUpstreamDefault/recording.json create mode 100644 test/integration/pushAndSetUpstreamDefault/setup.sh create mode 100644 test/integration/pushAndSetUpstreamDefault/test.json create mode 100644 test/integration/setUpstream/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/setUpstream/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/setUpstream/expected/.git_keep/HEAD create mode 100644 test/integration/setUpstream/expected/.git_keep/ORIG_HEAD create mode 100644 test/integration/setUpstream/expected/.git_keep/config create mode 100644 test/integration/setUpstream/expected/.git_keep/description create mode 100644 test/integration/setUpstream/expected/.git_keep/index create mode 100644 test/integration/setUpstream/expected/.git_keep/info/exclude create mode 100644 test/integration/setUpstream/expected/.git_keep/logs/HEAD create mode 100644 test/integration/setUpstream/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/setUpstream/expected/.git_keep/logs/refs/remotes/origin/master create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/setUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/setUpstream/expected/.git_keep/refs/heads/master create mode 100644 test/integration/setUpstream/expected/.git_keep/refs/remotes/origin/master create mode 100644 test/integration/setUpstream/expected/myfile1 create mode 100644 test/integration/setUpstream/expected/myfile2 create mode 100644 test/integration/setUpstream/expected/myfile3 create mode 100644 test/integration/setUpstream/expected/myfile4 create mode 100644 test/integration/setUpstream/expected_remote/HEAD create mode 100644 test/integration/setUpstream/expected_remote/config create mode 100644 test/integration/setUpstream/expected_remote/description create mode 100644 test/integration/setUpstream/expected_remote/info/exclude create mode 100644 test/integration/setUpstream/expected_remote/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 create mode 100644 test/integration/setUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 create mode 100644 test/integration/setUpstream/expected_remote/objects/14/8a38f7ce513079d6cd40e4a02f11e46ea2ba6b create mode 100644 test/integration/setUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/setUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce create mode 100644 test/integration/setUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 create mode 100644 test/integration/setUpstream/expected_remote/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 create mode 100644 test/integration/setUpstream/expected_remote/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 create mode 100644 test/integration/setUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/setUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 create mode 100644 test/integration/setUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/setUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/setUpstream/expected_remote/packed-refs create mode 100644 test/integration/setUpstream/recording.json create mode 100644 test/integration/setUpstream/setup.sh create mode 100644 test/integration/setUpstream/test.json diff --git a/.gitignore b/.gitignore index 481e36162..0e905b107 100644 --- a/.gitignore +++ b/.gitignore @@ -27,8 +27,10 @@ lazygit test/git_server/data test/integration/*/actual/ +test/integration/*/actual_remote/ test/integration/*/used_config/ -# these sample hooks waste too space space +# these sample hooks waste too much space test/integration/*/expected/.git_keep/hooks/ +test/integration/*/expected_remote/hooks/ !.git_keep/ lazygit.exe diff --git a/pkg/gui/custom_commands_test.go b/pkg/gui/custom_commands_test.go new file mode 100644 index 000000000..d51617c09 --- /dev/null +++ b/pkg/gui/custom_commands_test.go @@ -0,0 +1,63 @@ +package gui + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestGuiGenerateMenuCandidates(t *testing.T) { + type scenario struct { + testName string + cmdOut string + filter string + valueFormat string + labelFormat string + test func([]commandMenuEntry, error) + } + + scenarios := []scenario{ + { + "Extract remote branch name", + "upstream/pr-1", + "(?P[a-z_]+)/(?P.*)", + "{{ .branch }}", + "Remote: {{ .remote }}", + func(actualEntry []commandMenuEntry, err error) { + assert.NoError(t, err) + assert.EqualValues(t, "pr-1", actualEntry[0].value) + assert.EqualValues(t, "Remote: upstream", actualEntry[0].label) + }, + }, + { + "Multiple named groups with empty labelFormat", + "upstream/pr-1", + "(?P[a-z]*)/(?P.*)", + "{{ .branch }}|{{ .remote }}", + "", + func(actualEntry []commandMenuEntry, err error) { + assert.NoError(t, err) + assert.EqualValues(t, "pr-1|upstream", actualEntry[0].value) + assert.EqualValues(t, "pr-1|upstream", actualEntry[0].label) + }, + }, + { + "Multiple named groups with group ids", + "upstream/pr-1", + "(?P[a-z]*)/(?P.*)", + "{{ .group_2 }}|{{ .group_1 }}", + "Remote: {{ .group_1 }}", + func(actualEntry []commandMenuEntry, err error) { + assert.NoError(t, err) + assert.EqualValues(t, "pr-1|upstream", actualEntry[0].value) + assert.EqualValues(t, "Remote: upstream", actualEntry[0].label) + }, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + s.test(NewDummyGui().GenerateMenuCandidates(s.cmdOut, s.filter, s.valueFormat, s.labelFormat)) + }) + } +} diff --git a/pkg/gui/gui_test.go b/pkg/gui/gui_test.go index 20fec1b37..6e7a26b79 100644 --- a/pkg/gui/gui_test.go +++ b/pkg/gui/gui_test.go @@ -56,8 +56,8 @@ func Test(t *testing.T) { updateSnapshots, record, speedEnv, - func(t *testing.T, expected string, actual string) { - assert.Equal(t, expected, actual, fmt.Sprintf("expected:\n%s\nactual:\n%s\n", expected, actual)) + func(t *testing.T, expected string, actual string, prefix string) { + assert.Equal(t, expected, actual, fmt.Sprintf("Unexpected %s. Expected:\n%s\nActual:\n%s\n", prefix, expected, actual)) }, includeSkipped, ) @@ -81,59 +81,3 @@ func runCmdHeadless(cmd *exec.Cmd) error { return f.Close() } - -func TestGuiGenerateMenuCandidates(t *testing.T) { - type scenario struct { - testName string - cmdOut string - filter string - valueFormat string - labelFormat string - test func([]commandMenuEntry, error) - } - - scenarios := []scenario{ - { - "Extract remote branch name", - "upstream/pr-1", - "(?P[a-z_]+)/(?P.*)", - "{{ .branch }}", - "Remote: {{ .remote }}", - func(actualEntry []commandMenuEntry, err error) { - assert.NoError(t, err) - assert.EqualValues(t, "pr-1", actualEntry[0].value) - assert.EqualValues(t, "Remote: upstream", actualEntry[0].label) - }, - }, - { - "Multiple named groups with empty labelFormat", - "upstream/pr-1", - "(?P[a-z]*)/(?P.*)", - "{{ .branch }}|{{ .remote }}", - "", - func(actualEntry []commandMenuEntry, err error) { - assert.NoError(t, err) - assert.EqualValues(t, "pr-1|upstream", actualEntry[0].value) - assert.EqualValues(t, "pr-1|upstream", actualEntry[0].label) - }, - }, - { - "Multiple named groups with group ids", - "upstream/pr-1", - "(?P[a-z]*)/(?P.*)", - "{{ .group_2 }}|{{ .group_1 }}", - "Remote: {{ .group_1 }}", - func(actualEntry []commandMenuEntry, err error) { - assert.NoError(t, err) - assert.EqualValues(t, "pr-1|upstream", actualEntry[0].value) - assert.EqualValues(t, "Remote: upstream", actualEntry[0].label) - }, - }, - } - - for _, s := range scenarios { - t.Run(s.testName, func(t *testing.T) { - s.test(NewDummyGui().GenerateMenuCandidates(s.cmdOut, s.filter, s.valueFormat, s.labelFormat)) - }) - } -} diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go index 577aaa3b8..4b1842d44 100644 --- a/pkg/integration/integration.go +++ b/pkg/integration/integration.go @@ -33,7 +33,7 @@ func RunTests( updateSnapshots bool, record bool, speedEnv string, - onFail func(t *testing.T, expected string, actual string), + onFail func(t *testing.T, expected string, actual string, prefix string), includeSkipped bool, ) error { rootDir := GetRootDirectory() @@ -66,8 +66,10 @@ func RunTests( fnWrapper(test, func(t *testing.T) error { speeds := getTestSpeeds(test.Speed, updateSnapshots, speedEnv) testPath := filepath.Join(testDir, test.Name) - actualDir := filepath.Join(testPath, "actual") - expectedDir := filepath.Join(testPath, "expected") + actualRepoDir := filepath.Join(testPath, "actual") + expectedRepoDir := filepath.Join(testPath, "expected") + actualRemoteDir := filepath.Join(testPath, "actual_remote") + expectedRemoteDir := filepath.Join(testPath, "expected_remote") logf("path: %s", testPath) // three retries at normal speed for the sake of flakey tests @@ -76,8 +78,9 @@ func RunTests( logf("%s: attempting test at speed %f\n", test.Name, speed) findOrCreateDir(testPath) - prepareIntegrationTestDir(actualDir) - err := createFixture(testPath, actualDir) + prepareIntegrationTestDir(actualRepoDir) + removeRemoteDir(actualRemoteDir) + err := createFixture(testPath, actualRepoDir) if err != nil { return err } @@ -95,25 +98,46 @@ func RunTests( } if updateSnapshots { - err = oscommands.CopyDir(actualDir, expectedDir) + err = oscommands.CopyDir(actualRepoDir, expectedRepoDir) if err != nil { return err } err = os.Rename( - filepath.Join(expectedDir, ".git"), - filepath.Join(expectedDir, ".git_keep"), + filepath.Join(expectedRepoDir, ".git"), + filepath.Join(expectedRepoDir, ".git_keep"), ) if err != nil { return err } + + // see if we have a remote dir and if so, copy it over. Otherwise, delete the expected dir because we have no remote folder. + if folderExists(actualRemoteDir) { + err = oscommands.CopyDir(actualRemoteDir, expectedRemoteDir) + if err != nil { + return err + } + } else { + removeRemoteDir(expectedRemoteDir) + } } - actual, expected, err := generateSnapshots(actualDir, expectedDir) + actualRepo, expectedRepo, err := generateSnapshots(actualRepoDir, expectedRepoDir) if err != nil { return err } - if expected == actual { + actualRemote := "remote folder does not exist" + expectedRemote := "remote folder does not exist" + if folderExists(expectedRemoteDir) { + actualRemote, expectedRemote, err = generateSnapshotsForRemote(actualRemoteDir, expectedRemoteDir) + if err != nil { + return err + } + } else if folderExists(actualRemoteDir) { + actualRemote = "remote folder exists" + } + + if expectedRepo == actualRepo && expectedRemote == actualRemote { logf("%s: success at speed %f\n", test.Name, speed) break } @@ -126,7 +150,11 @@ func RunTests( return err } logf("%s", string(bytes)) - onFail(t, expected, actual) + if expectedRepo != actualRepo { + onFail(t, expectedRepo, actualRepo, "repo") + } else { + onFail(t, expectedRemote, actualRemote, "remote") + } } } @@ -137,6 +165,13 @@ func RunTests( return nil } +func removeRemoteDir(dir string) { + err := os.RemoveAll(dir) + if err != nil { + panic(err) + } +} + func prepareIntegrationTestDir(actualDir string) { // remove contents of integration test directory dir, err := ioutil.ReadDir(actualDir) @@ -351,6 +386,20 @@ func generateSnapshots(actualDir string, expectedDir string) (string, string, er return actual, expected, nil } +func generateSnapshotsForRemote(actualDir string, expectedDir string) (string, string, error) { + actual, err := generateSnapshot(actualDir) + if err != nil { + return "", "", err + } + + expected, err := generateSnapshot(expectedDir) + if err != nil { + return "", "", err + } + + return actual, expected, nil +} + func getLazygitCommand(testPath string, rootDir string, record bool, speed float64, extraCmdArgs string) (*exec.Cmd, error) { osCommand := oscommands.NewDummyOSCommand() @@ -397,3 +446,8 @@ func getLazygitCommand(testPath string, rootDir string, record bool, speed float return cmd, nil } + +func folderExists(path string) bool { + _, err := os.Stat(path) + return err == nil +} diff --git a/test/integration/forcePush/expected/.git_keep/COMMIT_EDITMSG b/test/integration/forcePush/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..51be8ec3d --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 diff --git a/test/integration/forcePush/expected/.git_keep/FETCH_HEAD b/test/integration/forcePush/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..8997b0d11 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +a9848fd98935937cd7d3909023ed1b588ccd4bfb branch 'master' of ../actual_remote diff --git a/test/integration/forcePush/expected/.git_keep/HEAD b/test/integration/forcePush/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/forcePush/expected/.git_keep/ORIG_HEAD b/test/integration/forcePush/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..c081af82f --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +a9848fd98935937cd7d3909023ed1b588ccd4bfb diff --git a/test/integration/forcePush/expected/.git_keep/config b/test/integration/forcePush/expected/.git_keep/config new file mode 100644 index 000000000..821803a3e --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/config @@ -0,0 +1,16 @@ +[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 diff --git a/test/integration/forcePush/expected/.git_keep/description b/test/integration/forcePush/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/forcePush/expected/.git_keep/index b/test/integration/forcePush/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..84d23c3f4afbf4ff385625f5edc40502c1aad440 GIT binary patch literal 281 zcmZ?q402{*U|<4b=ES1Der2a!>tQq_0|P5#M9>!ohQ=if42)laYD9pTZRwuJe^pa& ze2EB+;>mZq5a89)eU*Vdw=yj=C)E(B0Hj}~Ts0R)L(B>0MmI--=Z8^)(!O&qS1k&! z>Th|aJ>NndW{wfm9GxZ8d_d-aXs9_Y=;mB9Ir<>{pV6_hSLrWKTYO21z4bZ-W{wHa zoRA<_S0E+HV60%kb&kWMklA^8Q1Yvy)6w^rrR{ukE5mzDMNUU^<<&qP HJah;EYD8cc literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/info/exclude b/test/integration/forcePush/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/forcePush/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/forcePush/expected/.git_keep/logs/HEAD b/test/integration/forcePush/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..9cef8b360 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 1fe60e6b7023a1b9751850f83ac5bda49ddd9278 CI 1634897551 +1100 commit (initial): myfile1 +1fe60e6b7023a1b9751850f83ac5bda49ddd9278 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 commit: myfile2 +66bd8d357f6226ec264478db3606bc1c4be87e63 a9848fd98935937cd7d3909023ed1b588ccd4bfb CI 1634897551 +1100 commit: myfile3 +a9848fd98935937cd7d3909023ed1b588ccd4bfb 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 reset: moving to HEAD^ +66bd8d357f6226ec264478db3606bc1c4be87e63 aed1af42535c9c6a27b9f660119452328fddd7cd CI 1634897551 +1100 commit: myfile4 diff --git a/test/integration/forcePush/expected/.git_keep/logs/refs/heads/master b/test/integration/forcePush/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..9cef8b360 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 1fe60e6b7023a1b9751850f83ac5bda49ddd9278 CI 1634897551 +1100 commit (initial): myfile1 +1fe60e6b7023a1b9751850f83ac5bda49ddd9278 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 commit: myfile2 +66bd8d357f6226ec264478db3606bc1c4be87e63 a9848fd98935937cd7d3909023ed1b588ccd4bfb CI 1634897551 +1100 commit: myfile3 +a9848fd98935937cd7d3909023ed1b588ccd4bfb 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 reset: moving to HEAD^ +66bd8d357f6226ec264478db3606bc1c4be87e63 aed1af42535c9c6a27b9f660119452328fddd7cd CI 1634897551 +1100 commit: myfile4 diff --git a/test/integration/forcePush/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/forcePush/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..9ba3d77f4 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 66bd8d357f6226ec264478db3606bc1c4be87e63 CI 1634897551 +1100 fetch origin: storing head +66bd8d357f6226ec264478db3606bc1c4be87e63 a9848fd98935937cd7d3909023ed1b588ccd4bfb CI 1634897551 +1100 update by push +a9848fd98935937cd7d3909023ed1b588ccd4bfb aed1af42535c9c6a27b9f660119452328fddd7cd CI 1634897553 +1100 update by push diff --git a/test/integration/forcePush/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePush/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 b/test/integration/forcePush/expected/.git_keep/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 new file mode 100644 index 000000000..3c2c7f4e4 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 @@ -0,0 +1,5 @@ +xA +0@ѮsJF'E +7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/objects/66/bd8d357f6226ec264478db3606bc1c4be87e63 b/test/integration/forcePush/expected/.git_keep/objects/66/bd8d357f6226ec264478db3606bc1c4be87e63 new file mode 100644 index 0000000000000000000000000000000000000000..6ee9e62f1a1c6eac3720859ce6ee7bffdfe419e9 GIT binary patch literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}%XOaOCp{pKa(oC>mY$*}+_T~s~AMe3iw$|3J zf&8f-BATP~z=5hMMWhmvAk~ZxlSM4nW>c*PR68H?8etVQf;k%N7&65GDVUlZFCiE9 zR7xQmlj3)OY=@p^eVyjJe7NmTxhz||X+Y=GC`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePush/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/objects/a9/848fd98935937cd7d3909023ed1b588ccd4bfb b/test/integration/forcePush/expected/.git_keep/objects/a9/848fd98935937cd7d3909023ed1b588ccd4bfb new file mode 100644 index 0000000000000000000000000000000000000000..9dfd3c702a12e3a78438e08882a32bd1c2be4d8d GIT binary patch literal 149 zcmV;G0BZku0gaA93d0}}0DJZo-V4Qbbu|!5A*Vb;*Odlh6M}{I_stV}8W`pJV#kSZgYPH5!f?!LmQeqV{yit81cMVnH7&Sxdr}oC~pJBtw~j zU6vSxP^EW&Zik*`Jx=pOKB?`i+<0qu4TLTZ!F$kG0Ati?kd=Bj<`vI?pn7SB4i Dk%vNF literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd b/test/integration/forcePush/expected/.git_keep/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd new file mode 100644 index 000000000..3cd0bc9f7 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd @@ -0,0 +1,3 @@ +xA +0@Q9$I +"BW=F2bR">:]Dmz9^stRBsf2lyWCj>ęcD1r*7q'Y =!pFzLu37;/O%):e \ No newline at end of file diff --git a/test/integration/forcePush/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePush/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 new file mode 100644 index 0000000000000000000000000000000000000000..5e9361d3548aa14bca5d35e0871b31e326387c70 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePush/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePush/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected/.git_keep/refs/heads/master b/test/integration/forcePush/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..eaa7bcba3 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +aed1af42535c9c6a27b9f660119452328fddd7cd diff --git a/test/integration/forcePush/expected/.git_keep/refs/remotes/origin/master b/test/integration/forcePush/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..eaa7bcba3 --- /dev/null +++ b/test/integration/forcePush/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +aed1af42535c9c6a27b9f660119452328fddd7cd diff --git a/test/integration/forcePush/expected/myfile1 b/test/integration/forcePush/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/forcePush/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/forcePush/expected/myfile2 b/test/integration/forcePush/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/forcePush/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/forcePush/expected/myfile4 b/test/integration/forcePush/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/forcePush/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/forcePush/expected_remote/HEAD b/test/integration/forcePush/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/forcePush/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/forcePush/expected_remote/config b/test/integration/forcePush/expected_remote/config new file mode 100644 index 000000000..ea4d9033b --- /dev/null +++ b/test/integration/forcePush/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/forcePush/./actual diff --git a/test/integration/forcePush/expected_remote/description b/test/integration/forcePush/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/forcePush/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/forcePush/expected_remote/info/exclude b/test/integration/forcePush/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/forcePush/expected_remote/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/forcePush/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePush/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected_remote/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 b/test/integration/forcePush/expected_remote/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 new file mode 100644 index 000000000..3c2c7f4e4 --- /dev/null +++ b/test/integration/forcePush/expected_remote/objects/1f/e60e6b7023a1b9751850f83ac5bda49ddd9278 @@ -0,0 +1,5 @@ +xA +0@ѮsJF'E +7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected_remote/objects/66/bd8d357f6226ec264478db3606bc1c4be87e63 b/test/integration/forcePush/expected_remote/objects/66/bd8d357f6226ec264478db3606bc1c4be87e63 new file mode 100644 index 0000000000000000000000000000000000000000..6ee9e62f1a1c6eac3720859ce6ee7bffdfe419e9 GIT binary patch literal 149 zcmV;G0BZku0gaAJ3c@fDKwak)*$a}%XOaOCp{pKa(oC>mY$*}+_T~s~AMe3iw$|3J zf&8f-BATP~z=5hMMWhmvAk~ZxlSM4nW>c*PR68H?8etVQf;k%N7&65GDVUlZFCiE9 zR7xQmlj3)OY=@p^eVyjJe7NmTxhz||X+Y=GC`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/forcePush/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected_remote/objects/a9/848fd98935937cd7d3909023ed1b588ccd4bfb b/test/integration/forcePush/expected_remote/objects/a9/848fd98935937cd7d3909023ed1b588ccd4bfb new file mode 100644 index 0000000000000000000000000000000000000000..9dfd3c702a12e3a78438e08882a32bd1c2be4d8d GIT binary patch literal 149 zcmV;G0BZku0gaA93d0}}0DJZo-V4Qbbu|!5A*Vb;*Odlh6M}{I_stV}8W`pJV#kSZgYPH5!f?!LmQeqV{yit81cMVnH7&Sxdr}oC~pJBtw~j zU6vSxP^EW&Zik*`Jx=pOKB?`i+<0qu4TLTZ!F$kG0Ati?kd=Bj<`vI?pn7SB4i Dk%vNF literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected_remote/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd b/test/integration/forcePush/expected_remote/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd new file mode 100644 index 000000000..3cd0bc9f7 --- /dev/null +++ b/test/integration/forcePush/expected_remote/objects/ae/d1af42535c9c6a27b9f660119452328fddd7cd @@ -0,0 +1,3 @@ +xA +0@Q9$I +"BW=F2bR">:]Dmz9^stRBsf2lyWCj>ęcD1r*7q'Y =!pFzLu37;/O%):e \ No newline at end of file diff --git a/test/integration/forcePush/expected_remote/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/forcePush/expected_remote/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 new file mode 100644 index 0000000000000000000000000000000000000000..5e9361d3548aa14bca5d35e0871b31e326387c70 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/forcePush/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/forcePush/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/forcePush/expected_remote/packed-refs b/test/integration/forcePush/expected_remote/packed-refs new file mode 100644 index 000000000..7a7114a0a --- /dev/null +++ b/test/integration/forcePush/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +66bd8d357f6226ec264478db3606bc1c4be87e63 refs/heads/master diff --git a/test/integration/forcePush/expected_remote/refs/heads/master b/test/integration/forcePush/expected_remote/refs/heads/master new file mode 100644 index 000000000..eaa7bcba3 --- /dev/null +++ b/test/integration/forcePush/expected_remote/refs/heads/master @@ -0,0 +1 @@ +aed1af42535c9c6a27b9f660119452328fddd7cd diff --git a/test/integration/forcePush/recording.json b/test/integration/forcePush/recording.json new file mode 100644 index 000000000..1fd122aab --- /dev/null +++ b/test/integration/forcePush/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1054,"Mod":0,"Key":256,"Ch":80},{"Timestamp":1736,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2486,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/forcePush/setup.sh b/test/integration/forcePush/setup.sh new file mode 100644 index 000000000..79a9499d0 --- /dev/null +++ b/test/integration/forcePush/setup.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master + +echo test3 > myfile3 +git add . +git commit -am "myfile3" + +git push origin master + +git reset --hard HEAD^ + +echo test4 > myfile4 +git add . +git commit -am "myfile4" + diff --git a/test/integration/forcePush/test.json b/test/integration/forcePush/test.json new file mode 100644 index 000000000..42519ead4 --- /dev/null +++ b/test/integration/forcePush/test.json @@ -0,0 +1 @@ +{ "description": "force push with lease if required", "speed": 10 } diff --git a/test/integration/pull/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pull/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..51be8ec3d --- /dev/null +++ b/test/integration/pull/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 diff --git a/test/integration/pull/expected/.git_keep/FETCH_HEAD b/test/integration/pull/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..d13b7c7d7 --- /dev/null +++ b/test/integration/pull/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +6ad6c42187d356f4eab4f004cca17863746adec1 branch 'master' of ../actual_remote diff --git a/test/integration/pull/expected/.git_keep/HEAD b/test/integration/pull/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pull/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pull/expected/.git_keep/ORIG_HEAD b/test/integration/pull/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..22c16cf39 --- /dev/null +++ b/test/integration/pull/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +0c0f210a4e5ff3b58e4190501c2b755695f439fa diff --git a/test/integration/pull/expected/.git_keep/config b/test/integration/pull/expected/.git_keep/config new file mode 100644 index 000000000..821803a3e --- /dev/null +++ b/test/integration/pull/expected/.git_keep/config @@ -0,0 +1,16 @@ +[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 diff --git a/test/integration/pull/expected/.git_keep/description b/test/integration/pull/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pull/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pull/expected/.git_keep/index b/test/integration/pull/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..85847f1379e994a922c2dc26bbc09d8474657d49 GIT binary patch literal 353 zcmZ?q402{*U|<4bmc*hS4#tS11~8hDfq|7VLVGC#L*o(#2F9;IH6lRFwsg zzC?sZ@#H&Q2=Hp@zRJL!TbY)blWGW50MgH7cqJG{L(SQPZjJ=c52FU9edk`TS`=Q@ z-||X(zJ)r>93zN1oUCs94T0u>X^1&G;ppbv&*s%WQ}*l)|0#t->H=Q=8oQ22!^|;; znd3Rf4QvjOhME(BZq6l>qYuLW867KomHy(i#h0YmTdzZ4=9mD@2?=s_1yYg>CJF{z u`iUj1%ni={A{)~p7Kc4ga*kO#aSb~kdrJPhQ~Xi$*cLMHobs{1YYhNb@M{(T literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/info/exclude b/test/integration/pull/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pull/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/pull/expected/.git_keep/logs/HEAD b/test/integration/pull/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..f15401d8d --- /dev/null +++ b/test/integration/pull/expected/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 003527daa0801470151d8f93140a02fc306fea00 CI 1634896904 +1100 commit (initial): myfile1 +003527daa0801470151d8f93140a02fc306fea00 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI 1634896904 +1100 commit: myfile2 +0c0f210a4e5ff3b58e4190501c2b755695f439fa 336826e035e431ac94eca7f3cb6dd3fb072f7a5a CI 1634896904 +1100 commit: myfile3 +336826e035e431ac94eca7f3cb6dd3fb072f7a5a 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896904 +1100 commit: myfile4 +6ad6c42187d356f4eab4f004cca17863746adec1 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI 1634896904 +1100 reset: moving to head^^ +0c0f210a4e5ff3b58e4190501c2b755695f439fa 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896905 +1100 pull --no-edit: Fast-forward diff --git a/test/integration/pull/expected/.git_keep/logs/refs/heads/master b/test/integration/pull/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..f15401d8d --- /dev/null +++ b/test/integration/pull/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 003527daa0801470151d8f93140a02fc306fea00 CI 1634896904 +1100 commit (initial): myfile1 +003527daa0801470151d8f93140a02fc306fea00 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI 1634896904 +1100 commit: myfile2 +0c0f210a4e5ff3b58e4190501c2b755695f439fa 336826e035e431ac94eca7f3cb6dd3fb072f7a5a CI 1634896904 +1100 commit: myfile3 +336826e035e431ac94eca7f3cb6dd3fb072f7a5a 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896904 +1100 commit: myfile4 +6ad6c42187d356f4eab4f004cca17863746adec1 0c0f210a4e5ff3b58e4190501c2b755695f439fa CI 1634896904 +1100 reset: moving to head^^ +0c0f210a4e5ff3b58e4190501c2b755695f439fa 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896905 +1100 pull --no-edit: Fast-forward diff --git a/test/integration/pull/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pull/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..b254fcd0d --- /dev/null +++ b/test/integration/pull/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6ad6c42187d356f4eab4f004cca17863746adec1 CI 1634896904 +1100 fetch origin: storing head diff --git a/test/integration/pull/expected/.git_keep/objects/00/3527daa0801470151d8f93140a02fc306fea00 b/test/integration/pull/expected/.git_keep/objects/00/3527daa0801470151d8f93140a02fc306fea00 new file mode 100644 index 000000000..0ed3c76d8 --- /dev/null +++ b/test/integration/pull/expected/.git_keep/objects/00/3527daa0801470151d8f93140a02fc306fea00 @@ -0,0 +1,2 @@ +xA +0@ѮsʌNJ\yL")#tyS5[˥*`e3쩋T^%{⧽ i-U{I>H@+;9i'w+4, \ No newline at end of file diff --git a/test/integration/pull/expected/.git_keep/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa b/test/integration/pull/expected/.git_keep/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa new file mode 100644 index 0000000000000000000000000000000000000000..a89fa981c845c83f34edbf8b4a788ba7dfd19d23 GIT binary patch literal 148 zcmV;F0Biqv0gaA93WG2Z0DI0WaxawKB(4caDR}Z3tJ$T3sUj(~zi*z<>o730?4_*L zVhWdfidgP_K<<)4&LWy92_>D$Q*=bxxf#?2By;d7uWA8&=laYH5is~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pull/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pull/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a b/test/integration/pull/expected/.git_keep/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a new file mode 100644 index 0000000000000000000000000000000000000000..2b7ab37ad0008174d99f886bc4959e22c477379e GIT binary patch literal 150 zcmV;H0BQet0gaA93c@fDMP26<*$Xn$Nzw#FgsyswWIBTdV@rvkw>L*{_2Kb&eBNqZ zo5kc#?GUj;!I3xyT+|V1cBGmYB#pqa5Dx77vY0&|@@f_sbU?^XyebtR#bE*u$U_;u z56SmV(rog(J+{M6v%OC9T|T+)Pr2|`Zx#c&m_h<)&xin~(|)SSpSr1EU7tec2l=x) Eb1;WTR{#J2 literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 b/test/integration/pull/expected/.git_keep/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 new file mode 100644 index 000000000..335077711 --- /dev/null +++ b/test/integration/pull/expected/.git_keep/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 @@ -0,0 +1,2 @@ +xA +0@Q9Ed2I"BW=4`R"~◵[t껪! #LhkdO f]_"rLZ$V,3E_1uhx׏FJ#{p'7[90 \ No newline at end of file diff --git a/test/integration/pull/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pull/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pull/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pull/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pull/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected/.git_keep/refs/heads/master b/test/integration/pull/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..120f0043b --- /dev/null +++ b/test/integration/pull/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +6ad6c42187d356f4eab4f004cca17863746adec1 diff --git a/test/integration/pull/expected/.git_keep/refs/remotes/origin/master b/test/integration/pull/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..120f0043b --- /dev/null +++ b/test/integration/pull/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +6ad6c42187d356f4eab4f004cca17863746adec1 diff --git a/test/integration/pull/expected/myfile1 b/test/integration/pull/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/pull/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/pull/expected/myfile2 b/test/integration/pull/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/pull/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/pull/expected/myfile3 b/test/integration/pull/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/pull/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/pull/expected/myfile4 b/test/integration/pull/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/pull/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/pull/expected_remote/HEAD b/test/integration/pull/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pull/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pull/expected_remote/config b/test/integration/pull/expected_remote/config new file mode 100644 index 000000000..94ceda391 --- /dev/null +++ b/test/integration/pull/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pull/./actual diff --git a/test/integration/pull/expected_remote/description b/test/integration/pull/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pull/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pull/expected_remote/info/exclude b/test/integration/pull/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pull/expected_remote/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/pull/expected_remote/objects/00/3527daa0801470151d8f93140a02fc306fea00 b/test/integration/pull/expected_remote/objects/00/3527daa0801470151d8f93140a02fc306fea00 new file mode 100644 index 000000000..0ed3c76d8 --- /dev/null +++ b/test/integration/pull/expected_remote/objects/00/3527daa0801470151d8f93140a02fc306fea00 @@ -0,0 +1,2 @@ +xA +0@ѮsʌNJ\yL")#tyS5[˥*`e3쩋T^%{⧽ i-U{I>H@+;9i'w+4, \ No newline at end of file diff --git a/test/integration/pull/expected_remote/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa b/test/integration/pull/expected_remote/objects/0c/0f210a4e5ff3b58e4190501c2b755695f439fa new file mode 100644 index 0000000000000000000000000000000000000000..a89fa981c845c83f34edbf8b4a788ba7dfd19d23 GIT binary patch literal 148 zcmV;F0Biqv0gaA93WG2Z0DI0WaxawKB(4caDR}Z3tJ$T3sUj(~zi*z<>o730?4_*L zVhWdfidgP_K<<)4&LWy92_>D$Q*=bxxf#?2By;d7uWA8&=laYH5is~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pull/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pull/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected_remote/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a b/test/integration/pull/expected_remote/objects/33/6826e035e431ac94eca7f3cb6dd3fb072f7a5a new file mode 100644 index 0000000000000000000000000000000000000000..2b7ab37ad0008174d99f886bc4959e22c477379e GIT binary patch literal 150 zcmV;H0BQet0gaA93c@fDMP26<*$Xn$Nzw#FgsyswWIBTdV@rvkw>L*{_2Kb&eBNqZ zo5kc#?GUj;!I3xyT+|V1cBGmYB#pqa5Dx77vY0&|@@f_sbU?^XyebtR#bE*u$U_;u z56SmV(rog(J+{M6v%OC9T|T+)Pr2|`Zx#c&m_h<)&xin~(|)SSpSr1EU7tec2l=x) Eb1;WTR{#J2 literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected_remote/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 b/test/integration/pull/expected_remote/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 new file mode 100644 index 000000000..335077711 --- /dev/null +++ b/test/integration/pull/expected_remote/objects/6a/d6c42187d356f4eab4f004cca17863746adec1 @@ -0,0 +1,2 @@ +xA +0@Q9Ed2I"BW=4`R"~◵[t껪! #LhkdO f]_"rLZ$V,3E_1uhx׏FJ#{p'7[90 \ No newline at end of file diff --git a/test/integration/pull/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pull/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pull/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pull/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pull/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pull/expected_remote/packed-refs b/test/integration/pull/expected_remote/packed-refs new file mode 100644 index 000000000..2683a6cf6 --- /dev/null +++ b/test/integration/pull/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +6ad6c42187d356f4eab4f004cca17863746adec1 refs/heads/master diff --git a/test/integration/pull/recording.json b/test/integration/pull/recording.json new file mode 100644 index 000000000..9aa74c150 --- /dev/null +++ b/test/integration/pull/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":618,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1225,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pull/setup.sh b/test/integration/pull/setup.sh new file mode 100644 index 000000000..2634d0278 --- /dev/null +++ b/test/integration/pull/setup.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +# the test is to ensure that we actually can pull these two commits back from the origin +git reset --hard HEAD~2 +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master diff --git a/test/integration/pull/test.json b/test/integration/pull/test.json new file mode 100644 index 000000000..93a03aaea --- /dev/null +++ b/test/integration/pull/test.json @@ -0,0 +1 @@ +{ "description": "pull changes from the remote", "speed": 10 } diff --git a/test/integration/pullMerge/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullMerge/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..51be8ec3d --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 diff --git a/test/integration/pullMerge/expected/.git_keep/FETCH_HEAD b/test/integration/pullMerge/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e2a5e2793 --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +7f157a65ec0c8d6cffce08d6768e6733939e75a1 branch 'master' of ../actual_remote diff --git a/test/integration/pullMerge/expected/.git_keep/HEAD b/test/integration/pullMerge/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullMerge/expected/.git_keep/ORIG_HEAD b/test/integration/pullMerge/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..d3db7a1d9 --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +2a0805355a8040f9eebfa2dbf70b8bc313d6f456 diff --git a/test/integration/pullMerge/expected/.git_keep/config b/test/integration/pullMerge/expected/.git_keep/config new file mode 100644 index 000000000..110d1b43e --- /dev/null +++ b/test/integration/pullMerge/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/pullMerge/expected/.git_keep/description b/test/integration/pullMerge/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMerge/expected/.git_keep/index b/test/integration/pullMerge/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..d8f385b74a9d95b7966cc2d86c926ec998458214 GIT binary patch literal 353 zcmZ?q402{*U|<4bmc*hSZaG6iei+Tjz`)8Fq4S%8p>YWV1LIeq8WA97Te|1*U)9tb zUm`-Ic=DYt1bDS{Uu9s=txU_zNi_s20O^;{YkLBtA?D}`p_?PY^TVh?Y2Ue*s}_Y< z^|!pzo^PQJGsg&G4v)m2&)Gn8z%=H=Q=8oQ22!^|;; zx<}>g`aF<(Ks3~xHgt0?nH+r({?F)G*{k#yr!BrD#ol@y0yD=1Xii9wt1FO_WH3=M w;L=YlVP$S`?ibmZ7O^<&d6IL?(uv>yO^EN+T|b}qj{KCmSHGW^rz+$C066V&Gynhq literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/info/exclude b/test/integration/pullMerge/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullMerge/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/pullMerge/expected/.git_keep/logs/HEAD b/test/integration/pullMerge/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..bd085fb7f --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 7c0bda1656e7695870ed15839643564b0a9283a8 CI 1634896907 +1100 commit (initial): myfile1 +7c0bda1656e7695870ed15839643564b0a9283a8 5529eadf398ce89032744d5f4151000f07d70124 CI 1634896907 +1100 commit: myfile2 +5529eadf398ce89032744d5f4151000f07d70124 703e85166069a42b4254af06b68dffc159ea3f24 CI 1634896907 +1100 commit: myfile3 +703e85166069a42b4254af06b68dffc159ea3f24 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI 1634896907 +1100 commit: myfile4 +7f157a65ec0c8d6cffce08d6768e6733939e75a1 5529eadf398ce89032744d5f4151000f07d70124 CI 1634896907 +1100 reset: moving to head^^ +5529eadf398ce89032744d5f4151000f07d70124 2a0805355a8040f9eebfa2dbf70b8bc313d6f456 CI 1634896907 +1100 commit: myfile4 +2a0805355a8040f9eebfa2dbf70b8bc313d6f456 b10baba2f9d877322f94f8770e2e0c8ab1db6bcc CI 1634896908 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/.git_keep/logs/refs/heads/master b/test/integration/pullMerge/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..bd085fb7f --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 7c0bda1656e7695870ed15839643564b0a9283a8 CI 1634896907 +1100 commit (initial): myfile1 +7c0bda1656e7695870ed15839643564b0a9283a8 5529eadf398ce89032744d5f4151000f07d70124 CI 1634896907 +1100 commit: myfile2 +5529eadf398ce89032744d5f4151000f07d70124 703e85166069a42b4254af06b68dffc159ea3f24 CI 1634896907 +1100 commit: myfile3 +703e85166069a42b4254af06b68dffc159ea3f24 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI 1634896907 +1100 commit: myfile4 +7f157a65ec0c8d6cffce08d6768e6733939e75a1 5529eadf398ce89032744d5f4151000f07d70124 CI 1634896907 +1100 reset: moving to head^^ +5529eadf398ce89032744d5f4151000f07d70124 2a0805355a8040f9eebfa2dbf70b8bc313d6f456 CI 1634896907 +1100 commit: myfile4 +2a0805355a8040f9eebfa2dbf70b8bc313d6f456 b10baba2f9d877322f94f8770e2e0c8ab1db6bcc CI 1634896908 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMerge/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..cd4098ff1 --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 7f157a65ec0c8d6cffce08d6768e6733939e75a1 CI 1634896907 +1100 fetch origin: storing head diff --git a/test/integration/pullMerge/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/2a/0805355a8040f9eebfa2dbf70b8bc313d6f456 b/test/integration/pullMerge/expected/.git_keep/objects/2a/0805355a8040f9eebfa2dbf70b8bc313d6f456 new file mode 100644 index 0000000000000000000000000000000000000000..8988a8d062cba9e63f0513fd2482a1835976d4dd GIT binary patch literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$XmBCZB;KLRUS;G?`$bv86=N+uI|!eY^)RZ>=p| z8^TLJM06HNn4$rPj-$812}he}KbOiOgqb844oU5N$g6AbEeV(EC}l|m&PK%ID;jSA zph7GWj77!o{@e~dPI?%phkUs0tK9O|?%D*0i2^~?S94bCq~}zZKXui7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/55/29eadf398ce89032744d5f4151000f07d70124 b/test/integration/pullMerge/expected/.git_keep/objects/55/29eadf398ce89032744d5f4151000f07d70124 new file mode 100644 index 000000000..c0dd8a01d --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/objects/55/29eadf398ce89032744d5f4151000f07d70124 @@ -0,0 +1,2 @@ +xK +0@] 2$"BW=ƴ`R">7-"SU$P"W(E2׉ɞA}Tg~j|9] \ No newline at end of file diff --git a/test/integration/pullMerge/expected/.git_keep/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 b/test/integration/pullMerge/expected/.git_keep/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 new file mode 100644 index 0000000000000000000000000000000000000000..48dfdc50ca86e0ac57dc476fda8849770fbc6052 GIT binary patch literal 150 zcmV;H0BQet0gaA93c@fDMP26<*$Xn0nKTKA2wn9UX)=QaV@rvkx3@=d_2Kaz{Ia&T zbc=~keHXEA#y}+wSe1!1GpXi^q!CJ-30?8W7BO4i<<+hCE=jIRDHe$d$OY!=mC+*r zD1;gS9h>~_k9D`>WUu3NmrrinQ!Zs~H;V&tOhbZT&v;bkpvS2$f9j@vb$JSzAHWMa E?a4<)Q2+n{ literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 b/test/integration/pullMerge/expected/.git_keep/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 new file mode 100644 index 000000000..b08614b98 --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 @@ -0,0 +1,3 @@ +xA +0@Q9iI"BW=FL!R"~r*JdQCaV +R "\S.0p~6fw 9DLzLɝ})5, \ No newline at end of file diff --git a/test/integration/pullMerge/expected/.git_keep/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 b/test/integration/pullMerge/expected/.git_keep/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 new file mode 100644 index 0000000000000000000000000000000000000000..1af721127e85dd8509bb8daae20cbf8b14e32962 GIT binary patch literal 149 zcmV;G0BZku0gcW<3c@fDKvCB@MfQTsB$G)3B0^U^#xzc_(AZKU=`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/b1/0baba2f9d877322f94f8770e2e0c8ab1db6bcc b/test/integration/pullMerge/expected/.git_keep/objects/b1/0baba2f9d877322f94f8770e2e0c8ab1db6bcc new file mode 100644 index 0000000000000000000000000000000000000000..d3842cf9b80f6c1c5ddf54d2a6b69271dca98a24 GIT binary patch literal 204 zcmV;-05ku10gaC_Y6CG4MN{u7)VT<3Mmw631R(@mxyTv9NIQxRmSq$fa{Q=CpYHQ` zulTvudKqT({4~0%*$P|lfB*wH48^)+nJEYotLM!jWua)7yL7$HP#^#ykxU;-R82*; zJrxfrq>L7KE{^!m_r;PICe4t;&bgGVFo)-$>=7eI^(1zY$2hlcjwkbaJiY6W)caM} z-0GXLj4niu5X`f+0L!HF#L$20%ZK(aHL1%jpUt7l_e>9_6|=4{lE*`?pIvJky8Hq- G)>4eY8Dxt9 literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/pullMerge/expected/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 new file mode 100644 index 0000000000000000000000000000000000000000..5e9361d3548aa14bca5d35e0871b31e326387c70 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQr#ZlF88r;s1<|mAy)TaoXZbQtYkQ JApo0YFGO2mGTHzD literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected/.git_keep/refs/heads/master b/test/integration/pullMerge/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..547542fbd --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +b10baba2f9d877322f94f8770e2e0c8ab1db6bcc diff --git a/test/integration/pullMerge/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullMerge/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..0b78ce1e0 --- /dev/null +++ b/test/integration/pullMerge/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +7f157a65ec0c8d6cffce08d6768e6733939e75a1 diff --git a/test/integration/pullMerge/expected/myfile1 b/test/integration/pullMerge/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/pullMerge/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/pullMerge/expected/myfile2 b/test/integration/pullMerge/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/pullMerge/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/pullMerge/expected/myfile3 b/test/integration/pullMerge/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/pullMerge/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/pullMerge/expected/myfile4 b/test/integration/pullMerge/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/pullMerge/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/pullMerge/expected_remote/HEAD b/test/integration/pullMerge/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullMerge/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullMerge/expected_remote/config b/test/integration/pullMerge/expected_remote/config new file mode 100644 index 000000000..5a46fafb8 --- /dev/null +++ b/test/integration/pullMerge/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMerge/./actual diff --git a/test/integration/pullMerge/expected_remote/description b/test/integration/pullMerge/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullMerge/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMerge/expected_remote/info/exclude b/test/integration/pullMerge/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullMerge/expected_remote/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/pullMerge/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMerge/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected_remote/objects/55/29eadf398ce89032744d5f4151000f07d70124 b/test/integration/pullMerge/expected_remote/objects/55/29eadf398ce89032744d5f4151000f07d70124 new file mode 100644 index 000000000..c0dd8a01d --- /dev/null +++ b/test/integration/pullMerge/expected_remote/objects/55/29eadf398ce89032744d5f4151000f07d70124 @@ -0,0 +1,2 @@ +xK +0@] 2$"BW=ƴ`R">7-"SU$P"W(E2׉ɞA}Tg~j|9] \ No newline at end of file diff --git a/test/integration/pullMerge/expected_remote/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 b/test/integration/pullMerge/expected_remote/objects/70/3e85166069a42b4254af06b68dffc159ea3f24 new file mode 100644 index 0000000000000000000000000000000000000000..48dfdc50ca86e0ac57dc476fda8849770fbc6052 GIT binary patch literal 150 zcmV;H0BQet0gaA93c@fDMP26<*$Xn0nKTKA2wn9UX)=QaV@rvkx3@=d_2Kaz{Ia&T zbc=~keHXEA#y}+wSe1!1GpXi^q!CJ-30?8W7BO4i<<+hCE=jIRDHe$d$OY!=mC+*r zD1;gS9h>~_k9D`>WUu3NmrrinQ!Zs~H;V&tOhbZT&v;bkpvS2$f9j@vb$JSzAHWMa E?a4<)Q2+n{ literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected_remote/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 b/test/integration/pullMerge/expected_remote/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 new file mode 100644 index 000000000..b08614b98 --- /dev/null +++ b/test/integration/pullMerge/expected_remote/objects/7c/0bda1656e7695870ed15839643564b0a9283a8 @@ -0,0 +1,3 @@ +xA +0@Q9iI"BW=FL!R"~r*JdQCaV +R "\S.0p~6fw 9DLzLɝ})5, \ No newline at end of file diff --git a/test/integration/pullMerge/expected_remote/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 b/test/integration/pullMerge/expected_remote/objects/7f/157a65ec0c8d6cffce08d6768e6733939e75a1 new file mode 100644 index 0000000000000000000000000000000000000000..1af721127e85dd8509bb8daae20cbf8b14e32962 GIT binary patch literal 149 zcmV;G0BZku0gcW<3c@fDKvCB@MfQTsB$G)3B0^U^#xzc_(AZKU=`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullMerge/expected_remote/packed-refs b/test/integration/pullMerge/expected_remote/packed-refs new file mode 100644 index 000000000..0ec136723 --- /dev/null +++ b/test/integration/pullMerge/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +7f157a65ec0c8d6cffce08d6768e6733939e75a1 refs/heads/master diff --git a/test/integration/pullMerge/recording.json b/test/integration/pullMerge/recording.json new file mode 100644 index 000000000..9b948e3eb --- /dev/null +++ b/test/integration/pullMerge/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":537,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1401,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullMerge/setup.sh b/test/integration/pullMerge/setup.sh new file mode 100644 index 000000000..b9d9a933a --- /dev/null +++ b/test/integration/pullMerge/setup.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +git reset --hard HEAD~2 + +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master + +git config pull.rebase false diff --git a/test/integration/pullMerge/test.json b/test/integration/pullMerge/test.json new file mode 100644 index 000000000..8ce8c71bb --- /dev/null +++ b/test/integration/pullMerge/test.json @@ -0,0 +1 @@ +{ "description": "When user has configured pull with merge, ensure a merge commit is created upon pull", "speed": 10 } 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 new file mode 100644 index 0000000000000000000000000000000000000000..d9ffd9453dd4daf8e530e0933bdbe015580e81fb GIT binary patch literal 425 zcmZ?q402{*U|<4bmc*hSe#Z7`{xF)6fq|7VLNA1Yp>YWV1LIeq8WA97Te|1*U)9tb zUm`-Ic=DYt1bDS{Uu9s=txU_zNi_s20O@B6^Y?<$P;;`;&5_{wVbq|s@7&8(i^8k= zTV83;w@`8e)zivR@P9_f%3h_vIBoGIDfZUu5STe8KyyNZTwQ^bB!h{9 z0hfMa2`h7hbHB*Ow1~xF&y$>EmQD 1634896911 +1100 commit (initial): myfile1 +f0e8e7922de77a5ab20b924640c8b8435bae0b0b ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI 1634896911 +1100 commit: myfile2 +ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 CI 1634896911 +1100 commit: myfile3 +80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI 1634896911 +1100 commit: myfile4 +38699899bb94dfae74e3e55cf5bd6d92e6f3292a ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI 1634896911 +1100 reset: moving to head^^ +ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 7dba68a0030313e27b8dd5da2076952629485f2d CI 1634896911 +1100 commit: myfile4 conflict +7dba68a0030313e27b8dd5da2076952629485f2d 720c7e2dd34822d33cb24a0a3f0f4bdabf433500 CI 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 1634896911 +1100 commit (initial): myfile1 +f0e8e7922de77a5ab20b924640c8b8435bae0b0b ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI 1634896911 +1100 commit: myfile2 +ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 CI 1634896911 +1100 commit: myfile3 +80f8aed01cdb61f9e94c6a53c39f400dfbcf05c9 38699899bb94dfae74e3e55cf5bd6d92e6f3292a CI 1634896911 +1100 commit: myfile4 +38699899bb94dfae74e3e55cf5bd6d92e6f3292a ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa CI 1634896911 +1100 reset: moving to head^^ +ddf4b7fe8f45d07a181c2b57cc3434c982d3f4aa 7dba68a0030313e27b8dd5da2076952629485f2d CI 1634896911 +1100 commit: myfile4 conflict +7dba68a0030313e27b8dd5da2076952629485f2d 720c7e2dd34822d33cb24a0a3f0f4bdabf433500 CI 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 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 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f b/test/integration/pullMergeConflict/expected/.git_keep/objects/1f/e5d8152187295b171f171c0d55d809500ae80f new file mode 100644 index 0000000000000000000000000000000000000000..5fcd3c3ea0af298403cdc684968ff2bc352d8a8d GIT binary patch literal 85 zcmV-b0IL6Z0VTmv3Voe4^R rwLN9PKEaT0csM5GVjzk{%;c+PS-m(xEQ(x1B`ZOlC7a;~p%@uM%OfJ> literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMergeConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMergeConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 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%83Mlj{DI3vcyiVML14I04u*fODqXKGo#U+|;kGPeJnob9Fms D@H`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMergeConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullMergeConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 new file mode 100644 index 0000000000000000000000000000000000000000..5a90eb5f918fb5e180245d8dc9c96d1db503915e GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x J9RPa9ENwClFp~fP literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMergeConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected/.git_keep/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa b/test/integration/pullMergeConflict/expected/.git_keep/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa new file mode 100644 index 0000000000000000000000000000000000000000..805becbe2fd373937724be1bbd68f0cc0fa3ea2d GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeKzpNjC|I2tD-~n`VOrV@rvkzqe2DIt>`CU&08otwO#lD@ literal 0 HcmV?d00001 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 diff --git a/test/integration/pullMergeConflict/expected_remote/HEAD b/test/integration/pullMergeConflict/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullMergeConflict/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullMergeConflict/expected_remote/config b/test/integration/pullMergeConflict/expected_remote/config new file mode 100644 index 000000000..082441c96 --- /dev/null +++ b/test/integration/pullMergeConflict/expected_remote/config @@ -0,0 +1,8 @@ +[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 diff --git a/test/integration/pullMergeConflict/expected_remote/description b/test/integration/pullMergeConflict/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullMergeConflict/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMergeConflict/expected_remote/info/exclude b/test/integration/pullMergeConflict/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullMergeConflict/expected_remote/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_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMergeConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMergeConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a b/test/integration/pullMergeConflict/expected_remote/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a new file mode 100644 index 000000000..c7b25d78c --- /dev/null +++ b/test/integration/pullMergeConflict/expected_remote/objects/38/699899bb94dfae74e3e55cf5bd6d92e6f3292a @@ -0,0 +1,3 @@ +xA +0@Q9E4i"BW=F:D#ŗ֥ytj'PH4!sL%D֞; +QJ趲΀2O5pAB6m(ٕw{Fƻ~Jݞz%83Mlj{DI3vcyiVML14I04u*fODqXKGo#U+|;kGPeJnob9Fms D@H`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMergeConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMergeConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa b/test/integration/pullMergeConflict/expected_remote/objects/dd/f4b7fe8f45d07a181c2b57cc3434c982d3f4aa new file mode 100644 index 0000000000000000000000000000000000000000..805becbe2fd373937724be1bbd68f0cc0fa3ea2d GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeKzpNjC|I2tD-~n`VOrV@rvkzqe2DIt>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullMergeConflict/expected_remote/objects/f0/e8e7922de77a5ab20b924640c8b8435bae0b0b b/test/integration/pullMergeConflict/expected_remote/objects/f0/e8e7922de77a5ab20b924640c8b8435bae0b0b new file mode 100644 index 000000000..16a061777 --- /dev/null +++ b/test/integration/pullMergeConflict/expected_remote/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_remote/packed-refs b/test/integration/pullMergeConflict/expected_remote/packed-refs new file mode 100644 index 000000000..c67ebc4ab --- /dev/null +++ b/test/integration/pullMergeConflict/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +38699899bb94dfae74e3e55cf5bd6d92e6f3292a refs/heads/master diff --git a/test/integration/pullMergeConflict/recording.json b/test/integration/pullMergeConflict/recording.json new file mode 100644 index 000000000..9631a1943 --- /dev/null +++ b/test/integration/pullMergeConflict/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1428,"Mod":0,"Key":256,"Ch":112},{"Timestamp":2571,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3459,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3852,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4419,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5267,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6266,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullMergeConflict/setup.sh b/test/integration/pullMergeConflict/setup.sh new file mode 100644 index 000000000..a19999045 --- /dev/null +++ b/test/integration/pullMergeConflict/setup.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +git reset --hard HEAD~2 + +echo conflict > myfile4 +git add . +git commit -am "myfile4 conflict" + +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master + +git config pull.rebase false diff --git a/test/integration/pullMergeConflict/test.json b/test/integration/pullMergeConflict/test.json new file mode 100644 index 000000000..c1d7a3480 --- /dev/null +++ b/test/integration/pullMergeConflict/test.json @@ -0,0 +1 @@ +{ "description": "When user has configured pull with merge, ensure we handle conflicts", "speed": 5 } diff --git a/test/integration/pullRebase/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebase/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..ecdf2bdc8 --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile5 diff --git a/test/integration/pullRebase/expected/.git_keep/FETCH_HEAD b/test/integration/pullRebase/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..a05fa9894 --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +d0e04b2bced3bc76f0abf50698a7ab774cd54568 branch 'master' of ../actual_remote diff --git a/test/integration/pullRebase/expected/.git_keep/HEAD b/test/integration/pullRebase/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullRebase/expected/.git_keep/ORIG_HEAD b/test/integration/pullRebase/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..66241013d --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +7b21277988b03a5fd9e933126e8d1f31d2498d08 diff --git a/test/integration/pullRebase/expected/.git_keep/config b/test/integration/pullRebase/expected/.git_keep/config new file mode 100644 index 000000000..1a54274ac --- /dev/null +++ b/test/integration/pullRebase/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 = true diff --git a/test/integration/pullRebase/expected/.git_keep/description b/test/integration/pullRebase/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebase/expected/.git_keep/index b/test/integration/pullRebase/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..3e4466b50362efdb0b9570e06084d70a55f72c62 GIT binary patch literal 425 zcmZ?q402{*U|<4b*2JP7ap~_LoMAL0P>eA`e;)%w;}Ql2#;-s%B0$WxbkF0zs;M`= zM1)515kdkCDRWRV1@o(`x_AGaw)xVAlvt=elRI 1634896919 +1100 commit (initial): myfile1 +c0ae07711df69fb0a21efaca9d63da42a67eaedf 0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 CI 1634896919 +1100 commit: myfile2 +0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 fe1d53ca86366f64f689586cb0fe243fed1d1482 CI 1634896919 +1100 commit: myfile3 +fe1d53ca86366f64f689586cb0fe243fed1d1482 d0e04b2bced3bc76f0abf50698a7ab774cd54568 CI 1634896919 +1100 commit: myfile4 +d0e04b2bced3bc76f0abf50698a7ab774cd54568 0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 CI 1634896919 +1100 reset: moving to head^^ +0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 7b21277988b03a5fd9e933126e8d1f31d2498d08 CI 1634896919 +1100 commit: myfile5 +7b21277988b03a5fd9e933126e8d1f31d2498d08 d0e04b2bced3bc76f0abf50698a7ab774cd54568 CI 1634896920 +1100 pull --no-edit: checkout d0e04b2bced3bc76f0abf50698a7ab774cd54568 +d0e04b2bced3bc76f0abf50698a7ab774cd54568 74755f34462bd712c676b84247831233da97a272 CI 1634896920 +1100 pull --no-edit: myfile5 +74755f34462bd712c676b84247831233da97a272 74755f34462bd712c676b84247831233da97a272 CI 1634896920 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/.git_keep/logs/refs/heads/master b/test/integration/pullRebase/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..564aa150d --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 c0ae07711df69fb0a21efaca9d63da42a67eaedf CI 1634896919 +1100 commit (initial): myfile1 +c0ae07711df69fb0a21efaca9d63da42a67eaedf 0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 CI 1634896919 +1100 commit: myfile2 +0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 fe1d53ca86366f64f689586cb0fe243fed1d1482 CI 1634896919 +1100 commit: myfile3 +fe1d53ca86366f64f689586cb0fe243fed1d1482 d0e04b2bced3bc76f0abf50698a7ab774cd54568 CI 1634896919 +1100 commit: myfile4 +d0e04b2bced3bc76f0abf50698a7ab774cd54568 0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 CI 1634896919 +1100 reset: moving to head^^ +0bbb382cb5729bfd2e6fd3e1d60237e03cb375a4 7b21277988b03a5fd9e933126e8d1f31d2498d08 CI 1634896919 +1100 commit: myfile5 +7b21277988b03a5fd9e933126e8d1f31d2498d08 74755f34462bd712c676b84247831233da97a272 CI 1634896920 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebase/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..f04c3d5eb --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 d0e04b2bced3bc76f0abf50698a7ab774cd54568 CI 1634896919 +1100 fetch origin: storing head diff --git a/test/integration/pullRebase/expected/.git_keep/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 b/test/integration/pullRebase/expected/.git_keep/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 new file mode 100644 index 0000000000000000000000000000000000000000..53166135dbae63c5ed1c8c1a946414f568098d66 GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fD06pgwdlw{|#7zT5gr540ZL*7n#+DL6e{cPP*I{5LueHt% zFojdwMS!CZ$k(K{6cJ67gpy9=sdGfdxyh;vNM_?*o(-~Pu`wbR{dtxhigM;u$QKTd zDGEzb!>{&OcNj+Khw(0NuG=D)yw)2a`OqCDOmIfD)*SShYVxOU>PP2AocRJ?vO9v2 C=0-LE literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebase/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebase/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebase/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/74/755f34462bd712c676b84247831233da97a272 b/test/integration/pullRebase/expected/.git_keep/objects/74/755f34462bd712c676b84247831233da97a272 new file mode 100644 index 0000000000000000000000000000000000000000..6cf0952670e8a893cef91e7115c518780ffc6eb0 GIT binary patch literal 154 zcmV;L0A>Gp0ey}^3c@fDMP26<*$Xmhl1TJydZXfS`e%@+b znl|K4?GVuvXJK0e0 zQ|JrDJC9NEt39?ukCVQR(_P+N_f;-=t2b@Xx=2Wd^w}5y)oDM~7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsQplF88r;s1<|mAy)TaoXZbQtYkQ JApo0uFGXEsGXVeq literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 b/test/integration/pullRebase/expected/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 new file mode 100644 index 0000000000000000000000000000000000000000..6b5097ac8cca7b1e7a66276e1a6ceca12195c537 GIT binary patch literal 134 zcmV;10D1p-0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL o8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR~Cjm||4|0Gc99wM4=|lK=n! literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebase/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebase/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf b/test/integration/pullRebase/expected/.git_keep/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf new file mode 100644 index 000000000..bf8cba378 --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf @@ -0,0 +1,2 @@ +xA +0@ѮsJFc<ƘL")#tyS5[ S5d"9`'XZLEҽsi4cG7jO@)D;9i'w+6, \ No newline at end of file diff --git a/test/integration/pullRebase/expected/.git_keep/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 b/test/integration/pullRebase/expected/.git_keep/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 new file mode 100644 index 000000000..607a6325f --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 @@ -0,0 +1,3 @@ +xA +0@Q9Ed:Dz4D#/kKvUCO!@(4s0-j% #1Ke +6aw{Fƻ~rݞz)ky`$I 3@T?_[J8 \ No newline at end of file diff --git a/test/integration/pullRebase/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebase/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebase/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 b/test/integration/pullRebase/expected/.git_keep/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 new file mode 100644 index 0000000000000000000000000000000000000000..d16cbc927cf787de1c91f7733757481d6f250e27 GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJobrfC8qLQj20cC(8GV@rvkzqe2DG%(Czcx`Rz z7IHZCUBr5V5jjPu8W6PvR4o-yljB4Po`-`hW-GhAx^+Z^$ukY3&!p8$)QSQ%I*+3` zWWsSM!IXD@th=3Nd!6RHd`jD%a^bbzEJO?`#|+t?0h}|3J*K++nVa_2R?9m! Du~0;6 literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected/.git_keep/refs/heads/master b/test/integration/pullRebase/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..dcff007ea --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +74755f34462bd712c676b84247831233da97a272 diff --git a/test/integration/pullRebase/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullRebase/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..5a2173631 --- /dev/null +++ b/test/integration/pullRebase/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +d0e04b2bced3bc76f0abf50698a7ab774cd54568 diff --git a/test/integration/pullRebase/expected/myfile1 b/test/integration/pullRebase/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/pullRebase/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/pullRebase/expected/myfile2 b/test/integration/pullRebase/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/pullRebase/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/pullRebase/expected/myfile3 b/test/integration/pullRebase/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/pullRebase/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/pullRebase/expected/myfile4 b/test/integration/pullRebase/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/pullRebase/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/pullRebase/expected/myfile5 b/test/integration/pullRebase/expected/myfile5 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/pullRebase/expected/myfile5 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/pullRebase/expected_remote/HEAD b/test/integration/pullRebase/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullRebase/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullRebase/expected_remote/config b/test/integration/pullRebase/expected_remote/config new file mode 100644 index 000000000..201a8b505 --- /dev/null +++ b/test/integration/pullRebase/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebase/./actual diff --git a/test/integration/pullRebase/expected_remote/description b/test/integration/pullRebase/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullRebase/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebase/expected_remote/info/exclude b/test/integration/pullRebase/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullRebase/expected_remote/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/pullRebase/expected_remote/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 b/test/integration/pullRebase/expected_remote/objects/0b/bb382cb5729bfd2e6fd3e1d60237e03cb375a4 new file mode 100644 index 0000000000000000000000000000000000000000..53166135dbae63c5ed1c8c1a946414f568098d66 GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fD06pgwdlw{|#7zT5gr540ZL*7n#+DL6e{cPP*I{5LueHt% zFojdwMS!CZ$k(K{6cJ67gpy9=sdGfdxyh;vNM_?*o(-~Pu`wbR{dtxhigM;u$QKTd zDGEzb!>{&OcNj+Khw(0NuG=D)yw)2a`OqCDOmIfD)*SShYVxOU>PP2AocRJ?vO9v2 C=0-LE literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebase/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebase/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebase/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebase/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebase/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf b/test/integration/pullRebase/expected_remote/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf new file mode 100644 index 000000000..bf8cba378 --- /dev/null +++ b/test/integration/pullRebase/expected_remote/objects/c0/ae07711df69fb0a21efaca9d63da42a67eaedf @@ -0,0 +1,2 @@ +xA +0@ѮsJFc<ƘL")#tyS5[ S5d"9`'XZLEҽsi4cG7jO@)D;9i'w+6, \ No newline at end of file diff --git a/test/integration/pullRebase/expected_remote/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 b/test/integration/pullRebase/expected_remote/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 new file mode 100644 index 000000000..607a6325f --- /dev/null +++ b/test/integration/pullRebase/expected_remote/objects/d0/e04b2bced3bc76f0abf50698a7ab774cd54568 @@ -0,0 +1,3 @@ +xA +0@Q9Ed:Dz4D#/kKvUCO!@(4s0-j% #1Ke +6aw{Fƻ~rݞz)ky`$I 3@T?_[J8 \ No newline at end of file diff --git a/test/integration/pullRebase/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebase/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebase/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 b/test/integration/pullRebase/expected_remote/objects/fe/1d53ca86366f64f689586cb0fe243fed1d1482 new file mode 100644 index 0000000000000000000000000000000000000000..d16cbc927cf787de1c91f7733757481d6f250e27 GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJobrfC8qLQj20cC(8GV@rvkzqe2DG%(Czcx`Rz z7IHZCUBr5V5jjPu8W6PvR4o-yljB4Po`-`hW-GhAx^+Z^$ukY3&!p8$)QSQ%I*+3` zWWsSM!IXD@th=3Nd!6RHd`jD%a^bbzEJO?`#|+t?0h}|3J*K++nVa_2R?9m! Du~0;6 literal 0 HcmV?d00001 diff --git a/test/integration/pullRebase/expected_remote/packed-refs b/test/integration/pullRebase/expected_remote/packed-refs new file mode 100644 index 000000000..88b741528 --- /dev/null +++ b/test/integration/pullRebase/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +d0e04b2bced3bc76f0abf50698a7ab774cd54568 refs/heads/master diff --git a/test/integration/pullRebase/recording.json b/test/integration/pullRebase/recording.json new file mode 100644 index 000000000..b23747e49 --- /dev/null +++ b/test/integration/pullRebase/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":581,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1804,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebase/setup.sh b/test/integration/pullRebase/setup.sh new file mode 100644 index 000000000..aef24c8e8 --- /dev/null +++ b/test/integration/pullRebase/setup.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +git reset --hard HEAD~2 + +echo test4 > myfile5 +git add . +git commit -am "myfile5" + +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master + +git config pull.rebase true diff --git a/test/integration/pullRebase/test.json b/test/integration/pullRebase/test.json new file mode 100644 index 000000000..224a93e54 --- /dev/null +++ b/test/integration/pullRebase/test.json @@ -0,0 +1 @@ +{ "description": "When user has configured pull with rebase, ensure we rebase upon pull", "speed": 10 } diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseConflict/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..2f4ead100 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 conflict diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/FETCH_HEAD b/test/integration/pullRebaseConflict/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..8f2963fe4 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +103c3eb899d173b83fc1b40261c8880fef359cc3 branch 'master' of ../actual_remote diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/HEAD b/test/integration/pullRebaseConflict/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/ORIG_HEAD b/test/integration/pullRebaseConflict/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..4133994ce --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +116cef0e366265c3d002cdb3dce4e285e32b5d12 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/config b/test/integration/pullRebaseConflict/expected/.git_keep/config new file mode 100644 index 000000000..1a54274ac --- /dev/null +++ b/test/integration/pullRebaseConflict/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 = true diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/description b/test/integration/pullRebaseConflict/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/index b/test/integration/pullRebaseConflict/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..286197c1461dd70bf02192ff253a2dde710eb0d7 GIT binary patch literal 425 zcmZ?q402{*U|<4bmc*hSX?cYsYA~9Sfq|7V!q9?&p>YWV1LIeq8WA97Te|1*U)9tb zUm`-Ic=DYt1bDS{Uu9s=txU_zNi_s20O?n7n12jLL(TC=H%Ef!hf#ylzH={EEefyd zZ+WFX-$ET`juFHh8ENm#P@p+r8fwmSbaU=!^J3Dyr&S|+)#yF5F literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/info/exclude b/test/integration/pullRebaseConflict/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullRebaseConflict/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/pullRebaseConflict/expected/.git_keep/logs/HEAD b/test/integration/pullRebaseConflict/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..707a3154c --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 34574474ac6f7dd2d3142bc28ee39db88d8a16af CI 1634896923 +1100 commit (initial): myfile1 +34574474ac6f7dd2d3142bc28ee39db88d8a16af 3b9389ff50095ad2d66d33bb6d67b5700f0bf6da CI 1634896923 +1100 commit: myfile2 +3b9389ff50095ad2d66d33bb6d67b5700f0bf6da aa6ae0785290ee09875f6bd5a5d50c0e7002de13 CI 1634896923 +1100 commit: myfile3 +aa6ae0785290ee09875f6bd5a5d50c0e7002de13 103c3eb899d173b83fc1b40261c8880fef359cc3 CI 1634896923 +1100 commit: myfile4 +103c3eb899d173b83fc1b40261c8880fef359cc3 3b9389ff50095ad2d66d33bb6d67b5700f0bf6da CI 1634896923 +1100 reset: moving to head^^ +3b9389ff50095ad2d66d33bb6d67b5700f0bf6da 116cef0e366265c3d002cdb3dce4e285e32b5d12 CI 1634896923 +1100 commit: myfile4 conflict +116cef0e366265c3d002cdb3dce4e285e32b5d12 103c3eb899d173b83fc1b40261c8880fef359cc3 CI 1634896924 +1100 pull --no-edit: checkout 103c3eb899d173b83fc1b40261c8880fef359cc3 +103c3eb899d173b83fc1b40261c8880fef359cc3 db7122c7f62714dfa854d8d22b2081d308912af8 CI 1634896926 +1100 rebase: myfile4 conflict +db7122c7f62714dfa854d8d22b2081d308912af8 db7122c7f62714dfa854d8d22b2081d308912af8 CI 1634896926 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..eceafe30b --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 34574474ac6f7dd2d3142bc28ee39db88d8a16af CI 1634896923 +1100 commit (initial): myfile1 +34574474ac6f7dd2d3142bc28ee39db88d8a16af 3b9389ff50095ad2d66d33bb6d67b5700f0bf6da CI 1634896923 +1100 commit: myfile2 +3b9389ff50095ad2d66d33bb6d67b5700f0bf6da aa6ae0785290ee09875f6bd5a5d50c0e7002de13 CI 1634896923 +1100 commit: myfile3 +aa6ae0785290ee09875f6bd5a5d50c0e7002de13 103c3eb899d173b83fc1b40261c8880fef359cc3 CI 1634896923 +1100 commit: myfile4 +103c3eb899d173b83fc1b40261c8880fef359cc3 3b9389ff50095ad2d66d33bb6d67b5700f0bf6da CI 1634896923 +1100 reset: moving to head^^ +3b9389ff50095ad2d66d33bb6d67b5700f0bf6da 116cef0e366265c3d002cdb3dce4e285e32b5d12 CI 1634896923 +1100 commit: myfile4 conflict +116cef0e366265c3d002cdb3dce4e285e32b5d12 db7122c7f62714dfa854d8d22b2081d308912af8 CI 1634896926 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..f05f22244 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 103c3eb899d173b83fc1b40261c8880fef359cc3 CI 1634896923 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb6qcU9{uV+=sx69k_sh6$M|i6_>`E_f=nB z!+_?}kDP&XqKJ%oh~(J|X~%-vJ0V+Kh*sNVM@wqwBX1py1mi;~4ly`RLn2DXh)|+Y z+=y6E3ME$j?yq*hG{b$GpZUXeU-K=t`T$MF`aoeYaMc=7o%NjR`A@Fuw=8S65ZhMP LC3f`#< literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseConflict/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af b/test/integration/pullRebaseConflict/expected/.git_keep/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af new file mode 100644 index 000000000..229191e1c --- /dev/null +++ b/test/integration/pullRebaseConflict/expected/.git_keep/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af @@ -0,0 +1,2 @@ +xA + @Ѯ= DBV9ё2X<.7¹%"%KXݙ8c^'rM)DZssOn*h~5B, \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da b/test/integration/pullRebaseConflict/expected/.git_keep/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da new file mode 100644 index 0000000000000000000000000000000000000000..fd885765d2c5445f0ba1f3b35294c884533f6ba6 GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeLu#snUZ?r4A8FfDFL`Y@3+yNyC3N--Fbw9P$5hupb<@6ec`BM8-Ss+g DQ@BI6 literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 0000000000000000000000000000000000000000..adf64119a33d7621aeeaa505d30adb58afaa5559 GIT binary patch literal 15 Wcmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 new file mode 100644 index 0000000000000000000000000000000000000000..94a6241c858d7c00528a25258c2502d32f557df3 GIT binary patch literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$Xn0X{HH?2wn9U`OIL!*is_s?d=g}_| E4&OdRi2wiq literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 new file mode 100644 index 0000000000000000000000000000000000000000..5a90eb5f918fb5e180245d8dc9c96d1db503915e GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x J9RPa9ENwClFp~fP literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 new file mode 100644 index 0000000000000000000000000000000000000000..ae05cad1e9b8020cd457f6f2dbbad862ed152c53 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mDV}sySB22|cy| literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/db/7122c7f62714dfa854d8d22b2081d308912af8 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/db/7122c7f62714dfa854d8d22b2081d308912af8 new file mode 100644 index 0000000000000000000000000000000000000000..e8035ad35785e4b2b34594f4443428838d815088 GIT binary patch literal 159 zcmV;Q0AT-k0fo*@3c@fDKw;N8MfQTsWbz9lLRURTI+G8K<5V+2W_8T!>F&rc$ar>+aecU+fAb<8>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 b/test/integration/pullRebaseConflict/expected/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 new file mode 100644 index 0000000000000000000000000000000000000000..46f078ceee2ed262a72d6f0f45a22f3d94426414 GIT binary patch literal 56 zcmV-80LTA$0ZYosPf{>5WUzq%1rJw87p{`j;t~@sTL|Dv&d*EB$xJTcvV#DH+{(1f OoKzD9xC8)|0TdpJ6qcU9{uV+=sx69k_sh6$M|i6_>`E_f~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseConflict/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseConflict/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af b/test/integration/pullRebaseConflict/expected_remote/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af new file mode 100644 index 000000000..229191e1c --- /dev/null +++ b/test/integration/pullRebaseConflict/expected_remote/objects/34/574474ac6f7dd2d3142bc28ee39db88d8a16af @@ -0,0 +1,2 @@ +xA + @Ѯ= DBV9ё2X<.7¹%"%KXݙ8c^'rM)DZssOn*h~5B, \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da b/test/integration/pullRebaseConflict/expected_remote/objects/3b/9389ff50095ad2d66d33bb6d67b5700f0bf6da new file mode 100644 index 0000000000000000000000000000000000000000..fd885765d2c5445f0ba1f3b35294c884533f6ba6 GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeLu#snUZ?r4A8FfDFL`Y@3+yNyC3N--Fbw9P$5hupb<@6ec`BM8-Ss+g DQ@BI6 literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseConflict/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseConflict/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 b/test/integration/pullRebaseConflict/expected_remote/objects/aa/6ae0785290ee09875f6bd5a5d50c0e7002de13 new file mode 100644 index 0000000000000000000000000000000000000000..94a6241c858d7c00528a25258c2502d32f557df3 GIT binary patch literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$Xn0X{HH?2wn9U`OIL!*is_s?d=g}_| E4&OdRi2wiq literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseConflict/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseConflict/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseConflict/expected_remote/packed-refs b/test/integration/pullRebaseConflict/expected_remote/packed-refs new file mode 100644 index 000000000..5fc546218 --- /dev/null +++ b/test/integration/pullRebaseConflict/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +103c3eb899d173b83fc1b40261c8880fef359cc3 refs/heads/master diff --git a/test/integration/pullRebaseConflict/recording.json b/test/integration/pullRebaseConflict/recording.json new file mode 100644 index 000000000..46a1e361f --- /dev/null +++ b/test/integration/pullRebaseConflict/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":594,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1378,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1818,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2067,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2306,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2810,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3562,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/setup.sh b/test/integration/pullRebaseConflict/setup.sh new file mode 100644 index 000000000..63146bda2 --- /dev/null +++ b/test/integration/pullRebaseConflict/setup.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +git reset --hard HEAD~2 + +echo conflict > myfile4 +git add . +git commit -am "myfile4 conflict" + +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master + +git config pull.rebase true diff --git a/test/integration/pullRebaseConflict/test.json b/test/integration/pullRebaseConflict/test.json new file mode 100644 index 000000000..39ddf1e3d --- /dev/null +++ b/test/integration/pullRebaseConflict/test.json @@ -0,0 +1 @@ +{ "description": "When user has configured pull with rebase, ensure we handle conflicts", "speed": 10 } diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseInteractive/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..12f245db0 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,16 @@ +myfile4 conflict + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# interactive rebase in progress; onto ea4a99e +# Last command done (1 command done): +# pick efbb36c myfile4 conflict +# Next commands to do (3 remaining commands): +# pick 9147ce4 5 +# pick e2251a5 6 +# You are currently rebasing branch 'master' on 'ea4a99e'. +# +# Changes to be committed: +# modified: myfile4 +# diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/FETCH_HEAD b/test/integration/pullRebaseInteractive/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..5d2dc1af4 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +ea4a99ea801f54f1ec09a88a28c65eb4db5865aa branch 'master' of ../actual_remote diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/HEAD b/test/integration/pullRebaseInteractive/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/ORIG_HEAD b/test/integration/pullRebaseInteractive/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..a03bb270d --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +efbb36c97316886b089b1b27233cd8bfdc37ed4a diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/config b/test/integration/pullRebaseInteractive/expected/.git_keep/config new file mode 100644 index 000000000..cfff6ba8c --- /dev/null +++ b/test/integration/pullRebaseInteractive/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 = interactive diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/description b/test/integration/pullRebaseInteractive/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/index b/test/integration/pullRebaseInteractive/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..9060765360e9175190038b5e27f39482b0afa280 GIT binary patch literal 550 zcmZ?q402{*U|<4b_QawdMZx{Ddtfvp0|P5#gwbUNhQ=if42)laYD9pTZRwuJe^pa& ze2EB+;>mZq5a89)eU*Vdw=yj=C)E(B0Hj~&(zu3Nve&F70j=(@@KHmtvP{G!YLB`|YLVdg|_yaP4|NJGu}LW((NFmqPS z-3~SfNJGpqVI{>JbD%jPL9VVqij6_nP{Dxf$HEJ@u3e4sIsV7QZ<=}h>@_ZregOcz C7`4&> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/info/exclude b/test/integration/pullRebaseInteractive/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullRebaseInteractive/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/pullRebaseInteractive/expected/.git_keep/logs/HEAD b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..ea2e57777 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/HEAD @@ -0,0 +1,15 @@ +0000000000000000000000000000000000000000 74ca3dec707dde7c92727d9490517e498360fea8 CI 1634896929 +1100 commit (initial): myfile1 +74ca3dec707dde7c92727d9490517e498360fea8 ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 CI 1634896929 +1100 commit: myfile2 +ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 3fb33027aedae13ab0796292c821a0258f6c2f7b CI 1634896929 +1100 commit: myfile3 +3fb33027aedae13ab0796292c821a0258f6c2f7b ea4a99ea801f54f1ec09a88a28c65eb4db5865aa CI 1634896929 +1100 commit: myfile4 +ea4a99ea801f54f1ec09a88a28c65eb4db5865aa ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 CI 1634896929 +1100 reset: moving to head^^ +ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 efbb36c97316886b089b1b27233cd8bfdc37ed4a CI 1634896929 +1100 commit: myfile4 conflict +efbb36c97316886b089b1b27233cd8bfdc37ed4a 9147ce4817b84339d884cee1683f361fd3aa4696 CI 1634896929 +1100 commit: 5 +9147ce4817b84339d884cee1683f361fd3aa4696 e2251a5b6d32bf5fc57f234946e3fabeba3b5cca CI 1634896929 +1100 commit: 6 +e2251a5b6d32bf5fc57f234946e3fabeba3b5cca 89ee54b2ed7aff7c3aae24f64be85568f9a9d329 CI 1634896929 +1100 commit: 7 +89ee54b2ed7aff7c3aae24f64be85568f9a9d329 ea4a99ea801f54f1ec09a88a28c65eb4db5865aa CI 1634896931 +1100 rebase -i (start): checkout ea4a99ea801f54f1ec09a88a28c65eb4db5865aa +ea4a99ea801f54f1ec09a88a28c65eb4db5865aa 29daf999882c9e60c6b6a2868913a6cfd856d620 CI 1634896933 +1100 rebase -i (continue): myfile4 conflict +29daf999882c9e60c6b6a2868913a6cfd856d620 5c32741b468f0ab8ddd243e9871dcc8dec5c35f9 CI 1634896933 +1100 rebase -i (pick): 5 +5c32741b468f0ab8ddd243e9871dcc8dec5c35f9 423f7757eb2eea3de217b54447a94820af933d3a CI 1634896933 +1100 rebase -i (pick): 6 +423f7757eb2eea3de217b54447a94820af933d3a bf4fb489636d4bde42e478b04cbdcc079dcd0183 CI 1634896933 +1100 rebase -i (pick): 7 +bf4fb489636d4bde42e478b04cbdcc079dcd0183 bf4fb489636d4bde42e478b04cbdcc079dcd0183 CI 1634896933 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..6ebd29d80 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 74ca3dec707dde7c92727d9490517e498360fea8 CI 1634896929 +1100 commit (initial): myfile1 +74ca3dec707dde7c92727d9490517e498360fea8 ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 CI 1634896929 +1100 commit: myfile2 +ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 3fb33027aedae13ab0796292c821a0258f6c2f7b CI 1634896929 +1100 commit: myfile3 +3fb33027aedae13ab0796292c821a0258f6c2f7b ea4a99ea801f54f1ec09a88a28c65eb4db5865aa CI 1634896929 +1100 commit: myfile4 +ea4a99ea801f54f1ec09a88a28c65eb4db5865aa ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 CI 1634896929 +1100 reset: moving to head^^ +ca58e8d47d619ffb625dc021f0ab2bb0f0bcf623 efbb36c97316886b089b1b27233cd8bfdc37ed4a CI 1634896929 +1100 commit: myfile4 conflict +efbb36c97316886b089b1b27233cd8bfdc37ed4a 9147ce4817b84339d884cee1683f361fd3aa4696 CI 1634896929 +1100 commit: 5 +9147ce4817b84339d884cee1683f361fd3aa4696 e2251a5b6d32bf5fc57f234946e3fabeba3b5cca CI 1634896929 +1100 commit: 6 +e2251a5b6d32bf5fc57f234946e3fabeba3b5cca 89ee54b2ed7aff7c3aae24f64be85568f9a9d329 CI 1634896929 +1100 commit: 7 +89ee54b2ed7aff7c3aae24f64be85568f9a9d329 bf4fb489636d4bde42e478b04cbdcc079dcd0183 CI 1634896933 +1100 rebase -i (finish): refs/heads/master onto ea4a99ea801f54f1ec09a88a28c65eb4db5865aa diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..4a22e7de9 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 ea4a99ea801f54f1ec09a88a28c65eb4db5865aa CI 1634896929 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 new file mode 100644 index 0000000000000000000000000000000000000000..48767aa886048b23cf097a219630e55c2d620115 GIT binary patch literal 129 zcmV-{0Dk{?0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x j9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRExd__Fx36wv- literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 new file mode 100644 index 0000000000000000000000000000000000000000..4df0a731dc343a188a0fb290b2f5128b2f1153cc GIT binary patch literal 160 zcmV;R0AK%j0V^p=O;s>5G+;0^FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< O6eVU@l>h(|3R+9Gh)mxA literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/29/daf999882c9e60c6b6a2868913a6cfd856d620 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/29/daf999882c9e60c6b6a2868913a6cfd856d620 new file mode 100644 index 0000000000000000000000000000000000000000..59ed7fe6b33507fd9648afd49f5da1caf77db00e GIT binary patch literal 159 zcmV;Q0AT-k0e#L*3c@fDKw;N8#q0&i&m^6Ih|pD!F-;~|XiO;)^!9e)+U?_8ywqx4 zI#}&aeHVe*W_CFk&xW)wIwE1TIB?Fxkac7c9nc%K@h;B}!pJcSlQzX;F_I2L#FkR< zGGm@S1<$Pb)gNt#af0hO-Q~@7Tji2ky@3f1DTZhxoQ=_19rc*%@}E2ROo literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b new file mode 100644 index 0000000000000000000000000000000000000000..72f6e886bb5d1e1b001f1484f5f5bac4c127cfc7 GIT binary patch literal 150 zcmV;H0BQet0gaA93c@fD06pgwxeJorP16KKgr540WV4F}V@rvkzqe2DG%(Czcx`Rz z7Lq^pUBqI6kvImZ>WMUaQq2`eqvKczkcWdTX3M+0y5&4XiPeuaKvFFMhsq8?T`pLP zQ&(66lF9G>Sa&x 2JA*8!:lXOn!QuF"*R +!bev^y^m{ꩬb!a Naܘ9⏛d-7 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/5c/32741b468f0ab8ddd243e9871dcc8dec5c35f9 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/5c/32741b468f0ab8ddd243e9871dcc8dec5c35f9 new file mode 100644 index 0000000000000000000000000000000000000000..3bc24fb42a2ebae386f4163bce49748d14ac1468 GIT binary patch literal 148 zcmV;F0Biqv0e#NF3c@f9fML&lirxiD(={d_BJ8xsNYfSt=f5G+;0^FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x s9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRGR5;MX|%&{r~070o;-dj;aga7~l literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/74/ca3dec707dde7c92727d9490517e498360fea8 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/74/ca3dec707dde7c92727d9490517e498360fea8 new file mode 100644 index 000000000..2f5e7e39f --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/74/ca3dec707dde7c92727d9490517e498360fea8 @@ -0,0 +1,2 @@ +xA +0@Q9ɤ4cL!R"~H|*x\2&H1rH J'l;L3ܦצ)$8#zzLɝ})7(, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/89/ee54b2ed7aff7c3aae24f64be85568f9a9d329 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/89/ee54b2ed7aff7c3aae24f64be85568f9a9d329 new file mode 100644 index 0000000000000000000000000000000000000000..155cfe5f621dbbb8658065a48bb4b916eb04a63f GIT binary patch literal 144 zcmV;B0B`?z0gaA93c@fD06pgwdlw|T$)*X22tD-~n`DE6v86=t`SuB3hk=>0_Wm4z zF`mY*3S4cCnkkUOXp1Cn6r6995;t#|u(GI-*<{!E03~7+&Y?QWja%WVk@Lw1bxpEn yahXdIBcJhDcbFHr&dXiD(zlmh%Gz&$M7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x o9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRGR5;Lqy0K~gZYgBqc;s5{u literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/91/47ce4817b84339d884cee1683f361fd3aa4696 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/91/47ce4817b84339d884cee1683f361fd3aa4696 new file mode 100644 index 0000000000000000000000000000000000000000..04880639a80bb798beca13bea7214b40d2ee5152 GIT binary patch literal 144 zcmV;B0B`?z0gcW<3c@fDKvCB@MfQSBnq)Eo5uvLdVxfQcSG52Pf(ZhNQeb3djv!Ownt>%^su;;9v+=I)VRaSpSaR|XiBN#DxPwpLmrAnM y;*-|EhCk!ccRMfkIxlzqa@$^dDZSmSLmwz(p0YhV2VjnRObz{$n`nNclQ=v1J3?Fl literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae new file mode 100644 index 0000000000000000000000000000000000000000..13e3f581a83ab9bb85f981c1ced8c88be9a191f4 GIT binary patch literal 24 gcmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 new file mode 100644 index 0000000000000000000000000000000000000000..5a90eb5f918fb5e180245d8dc9c96d1db503915e GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x J9RPa9ENwClFp~fP literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 new file mode 100644 index 0000000000000000000000000000000000000000..ae05cad1e9b8020cd457f6f2dbbad862ed152c53 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mDV}sySB22|cy| literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/b8/9e837219d9a8aceb8b0f13381be0afb0dac427 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/b8/9e837219d9a8aceb8b0f13381be0afb0dac427 new file mode 100644 index 0000000000000000000000000000000000000000..3d41eceda3b828723618d4b8eafb9f7ae35db66d GIT binary patch literal 67 zcmV-J0KETr0ZYosPf{>9Vz7Y#1rJw87p{`j;t~@sTL|Dv&d*EB$xJTcvV#DH)U>1| ZW3yyEJw1io%CyX!R1*cb8US}47bUhT8~FeL literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/bf/4fb489636d4bde42e478b04cbdcc079dcd0183 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/bf/4fb489636d4bde42e478b04cbdcc079dcd0183 new file mode 100644 index 0000000000000000000000000000000000000000..11a65f3f4bcc8b5a8d465fbb93d4fe158e662693 GIT binary patch literal 147 zcmV;E0Brww0ey}^3c@fD06pgwxeLlwgr540-DZP=v86=t`R3r+;|z0{Wv%tm zJfw7JyP3~1Ed@ZSsAh@4tc0T~TPl)83lUl;x5;j==3~IF&SV|%UZ7=YHyG*5fokoUIz5oCK literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e new file mode 100644 index 0000000000000000000000000000000000000000..d63c59fb0e8394b0782dd66ed7f317f0e55a06dd GIT binary patch literal 163 zcmV;U09^lg0V^p=O;s>5F=a3`FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< R6eVVam6&5y0svvIYS62oPv-yt literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/e2/251a5b6d32bf5fc57f234946e3fabeba3b5cca b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/e2/251a5b6d32bf5fc57f234946e3fabeba3b5cca new file mode 100644 index 0000000000000000000000000000000000000000..f4473469bc89c2a17bcddc339bca9ac674dec612 GIT binary patch literal 143 zcmV;A0C4|!0gaA93c@fD06pgwxeL2(_XF-qHrs|MLlpo3 literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa new file mode 100644 index 000000000..a9ed03844 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa @@ -0,0 +1,2 @@ +xA +0@Q9EdfI"BW=4NR"~◵[wU!z%)U0$X#P$d0D0>Ddr13f, AT`wF{ƻ~m^n|ʜ13sT?i:/g8 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ef/bb36c97316886b089b1b27233cd8bfdc37ed4a b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ef/bb36c97316886b089b1b27233cd8bfdc37ed4a new file mode 100644 index 000000000..2f6153345 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/ef/bb36c97316886b089b1b27233cd8bfdc37ed4a @@ -0,0 +1,2 @@ +xA +0@Q9E̤ɘU1NИR">Kup껪eIP g2xz2V8D̈́L. pv9C,`ݟmdomՋzHK`=-˪J{un~/>@ \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 b/test/integration/pullRebaseInteractive/expected/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 new file mode 100644 index 0000000000000000000000000000000000000000..b0b5fcfd94a82a824337e37327c599f2dbe1f932 GIT binary patch literal 154 zcmV;L0A>Gp0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< I01`Jz+3(>@2LJ#7 literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractive/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..bc528dc20 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +bf4fb489636d4bde42e478b04cbdcc079dcd0183 diff --git a/test/integration/pullRebaseInteractive/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..0597374d4 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +ea4a99ea801f54f1ec09a88a28c65eb4db5865aa diff --git a/test/integration/pullRebaseInteractive/expected/myfile1 b/test/integration/pullRebaseInteractive/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/pullRebaseInteractive/expected/myfile2 b/test/integration/pullRebaseInteractive/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/pullRebaseInteractive/expected/myfile3 b/test/integration/pullRebaseInteractive/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/pullRebaseInteractive/expected/myfile4 b/test/integration/pullRebaseInteractive/expected/myfile4 new file mode 100644 index 000000000..9b1719f5c --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/myfile4 @@ -0,0 +1 @@ +conflict diff --git a/test/integration/pullRebaseInteractive/expected/myfile5 b/test/integration/pullRebaseInteractive/expected/myfile5 new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/myfile5 @@ -0,0 +1 @@ +test diff --git a/test/integration/pullRebaseInteractive/expected/myfile6 b/test/integration/pullRebaseInteractive/expected/myfile6 new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/myfile6 @@ -0,0 +1 @@ +test diff --git a/test/integration/pullRebaseInteractive/expected/myfile7 b/test/integration/pullRebaseInteractive/expected/myfile7 new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected/myfile7 @@ -0,0 +1 @@ +test diff --git a/test/integration/pullRebaseInteractive/expected_remote/HEAD b/test/integration/pullRebaseInteractive/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected_remote/config b/test/integration/pullRebaseInteractive/expected_remote/config new file mode 100644 index 000000000..79d424485 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractive/./actual diff --git a/test/integration/pullRebaseInteractive/expected_remote/description b/test/integration/pullRebaseInteractive/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractive/expected_remote/info/exclude b/test/integration/pullRebaseInteractive/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected_remote/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/pullRebaseInteractive/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractive/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractive/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractive/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b b/test/integration/pullRebaseInteractive/expected_remote/objects/3f/b33027aedae13ab0796292c821a0258f6c2f7b new file mode 100644 index 0000000000000000000000000000000000000000..72f6e886bb5d1e1b001f1484f5f5bac4c127cfc7 GIT binary patch literal 150 zcmV;H0BQet0gaA93c@fD06pgwxeJorP16KKgr540WV4F}V@rvkzqe2DG%(Czcx`Rz z7Lq^pUBqI6kvImZ>WMUaQq2`eqvKczkcWdTX3M+0y5&4XiPeuaKvFFMhsq8?T`pLP zQ&(66lF9G>Sa&`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractive/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 b/test/integration/pullRebaseInteractive/expected_remote/objects/ca/58e8d47d619ffb625dc021f0ab2bb0f0bcf623 new file mode 100644 index 0000000000000000000000000000000000000000..1cf77f0bb2c15939136f379df9a0af55100d0c16 GIT binary patch literal 150 zcmV;H0BQet0gaA93d0}}MZ5MC?h8dnGvh!gg{*Q6qazK(CIk!Z?duV`{k+HfX|Hu{ z+Oog2Q$$B{-o}B8$yuZ@vLKfQ9R@(m0E;Q$Evh4)@@krViY`kcLtUW6KtP#2o57NJ z4h~I`7*u?>=YHyG*5fokoUIz5oCK literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractive/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractive/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractive/expected_remote/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa b/test/integration/pullRebaseInteractive/expected_remote/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa new file mode 100644 index 000000000..a9ed03844 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected_remote/objects/ea/4a99ea801f54f1ec09a88a28c65eb4db5865aa @@ -0,0 +1,2 @@ +xA +0@Q9EdfI"BW=4NR"~◵[wU!z%)U0$X#P$d0D0>Ddr13f, AT`wF{ƻ~m^n|ʜ13sT?i:/g8 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected_remote/packed-refs b/test/integration/pullRebaseInteractive/expected_remote/packed-refs new file mode 100644 index 000000000..33ecbd263 --- /dev/null +++ b/test/integration/pullRebaseInteractive/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +ea4a99ea801f54f1ec09a88a28c65eb4db5865aa refs/heads/master diff --git a/test/integration/pullRebaseInteractive/recording.json b/test/integration/pullRebaseInteractive/recording.json new file mode 100644 index 000000000..dee2e4d8b --- /dev/null +++ b/test/integration/pullRebaseInteractive/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1280,"Mod":0,"Key":256,"Ch":112},{"Timestamp":2032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2392,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2640,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2896,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3384,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4158,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/setup.sh b/test/integration/pullRebaseInteractive/setup.sh new file mode 100644 index 000000000..0795a297f --- /dev/null +++ b/test/integration/pullRebaseInteractive/setup.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +git reset --hard HEAD~2 + +echo conflict > myfile4 +git add . +git commit -am "myfile4 conflict" + +echo test > myfile5 +git add . +git commit -am "5" + +echo test > myfile6 +git add . +git commit -am "6" + +echo test > myfile7 +git add . +git commit -am "7" + +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master + +git config pull.rebase interactive diff --git a/test/integration/pullRebaseInteractive/test.json b/test/integration/pullRebaseInteractive/test.json new file mode 100644 index 000000000..7eb652fa1 --- /dev/null +++ b/test/integration/pullRebaseInteractive/test.json @@ -0,0 +1 @@ +{ "description": "When user has configured pull with interactive rebase, ensure we handle conflicts", "speed": 5 } diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..13b4a42ac --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,16 @@ +myfile4 conflict + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# interactive rebase in progress; onto 4589efc +# Last command done (1 command done): +# pick 9013b5f myfile4 conflict +# Next commands to do (3 remaining commands): +# pick 0fa5386 5 +# drop 69a5c9f 6 +# You are currently rebasing branch 'master' on '4589efc'. +# +# Changes to be committed: +# modified: myfile4 +# diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/FETCH_HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..4d6186494 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +4589efcaf3024e841825bb289bb88eb0e4f8530a branch 'master' of ../actual_remote diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/ORIG_HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..d989f6dc2 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +9013b5f12ca8a0fdd44fbe72028500bbac5c89ee diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/config b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/config new file mode 100644 index 000000000..cfff6ba8c --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/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 = interactive diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/description b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/index b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..109dfab63aa2fbd54a29164d8a3041afe9b3f3b0 GIT binary patch literal 550 zcmZ?q402{*U|<4bw#1?y4UP%{V;IfIz`)8FVRDy&p>YWV1LIeq8WE7XrF$O#RZYF| zB_cG6C*SEpfLBZRRR;Fl%CyX!R70QwkbchGFliVKHRlVuITAcSj2e{ooqM@zQFv8< z%PZ~q7V0o_j3DM{F`T%~4>Si%L(DNfh;GjPY+mg%WzXL5pHeuaF5u;_vFnI5%p7Bg zIeHAaFWG_SfN7{Xm(a}NoGmW-^*r0ujEaDU1-n=8t1+)rS_d=71Zs{FyUrevIUpKp z&Sx}pSm&-=zq8Hfi$UnR$@?~}zjpkh%l;)Wb4+38 1634896936 +1100 commit (initial): myfile1 +5759b6258419271e67a172e51cd90048dd21f9c0 476a1939075b60aa47da50a8c40c5b4412a2f18b CI 1634896936 +1100 commit: myfile2 +476a1939075b60aa47da50a8c40c5b4412a2f18b e047462bda495acbe565c85b205d614f38c0a692 CI 1634896936 +1100 commit: myfile3 +e047462bda495acbe565c85b205d614f38c0a692 4589efcaf3024e841825bb289bb88eb0e4f8530a CI 1634896936 +1100 commit: myfile4 +4589efcaf3024e841825bb289bb88eb0e4f8530a 476a1939075b60aa47da50a8c40c5b4412a2f18b CI 1634896936 +1100 reset: moving to head^^ +476a1939075b60aa47da50a8c40c5b4412a2f18b 9013b5f12ca8a0fdd44fbe72028500bbac5c89ee CI 1634896936 +1100 commit: myfile4 conflict +9013b5f12ca8a0fdd44fbe72028500bbac5c89ee 0fa53867500c0f3a5cca9b2112982795fae51c51 CI 1634896936 +1100 commit: 5 +0fa53867500c0f3a5cca9b2112982795fae51c51 69a5c9fb912112305bfe15272855afb50f6acf4b CI 1634896936 +1100 commit: 6 +69a5c9fb912112305bfe15272855afb50f6acf4b af4c4b2b977f8909e590ea5bc3bab59d991e4c28 CI 1634896936 +1100 commit: 7 +af4c4b2b977f8909e590ea5bc3bab59d991e4c28 4589efcaf3024e841825bb289bb88eb0e4f8530a CI 1634896938 +1100 rebase -i (start): checkout 4589efcaf3024e841825bb289bb88eb0e4f8530a +4589efcaf3024e841825bb289bb88eb0e4f8530a 5d08d9b6315ddb8fb8372d83b54862ba7d7fdc88 CI 1634896942 +1100 rebase -i (continue): myfile4 conflict +5d08d9b6315ddb8fb8372d83b54862ba7d7fdc88 7c717449332e4a81f7e5643eef9c95f459444e3f CI 1634896942 +1100 rebase -i (pick): 5 +7c717449332e4a81f7e5643eef9c95f459444e3f ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI 1634896942 +1100 rebase -i (pick): 7 +ae4e33d43751b83fbd0b6f0a1796d58462492e47 ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI 1634896942 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..ae47bc191 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,10 @@ +0000000000000000000000000000000000000000 5759b6258419271e67a172e51cd90048dd21f9c0 CI 1634896936 +1100 commit (initial): myfile1 +5759b6258419271e67a172e51cd90048dd21f9c0 476a1939075b60aa47da50a8c40c5b4412a2f18b CI 1634896936 +1100 commit: myfile2 +476a1939075b60aa47da50a8c40c5b4412a2f18b e047462bda495acbe565c85b205d614f38c0a692 CI 1634896936 +1100 commit: myfile3 +e047462bda495acbe565c85b205d614f38c0a692 4589efcaf3024e841825bb289bb88eb0e4f8530a CI 1634896936 +1100 commit: myfile4 +4589efcaf3024e841825bb289bb88eb0e4f8530a 476a1939075b60aa47da50a8c40c5b4412a2f18b CI 1634896936 +1100 reset: moving to head^^ +476a1939075b60aa47da50a8c40c5b4412a2f18b 9013b5f12ca8a0fdd44fbe72028500bbac5c89ee CI 1634896936 +1100 commit: myfile4 conflict +9013b5f12ca8a0fdd44fbe72028500bbac5c89ee 0fa53867500c0f3a5cca9b2112982795fae51c51 CI 1634896936 +1100 commit: 5 +0fa53867500c0f3a5cca9b2112982795fae51c51 69a5c9fb912112305bfe15272855afb50f6acf4b CI 1634896936 +1100 commit: 6 +69a5c9fb912112305bfe15272855afb50f6acf4b af4c4b2b977f8909e590ea5bc3bab59d991e4c28 CI 1634896936 +1100 commit: 7 +af4c4b2b977f8909e590ea5bc3bab59d991e4c28 ae4e33d43751b83fbd0b6f0a1796d58462492e47 CI 1634896942 +1100 rebase -i (finish): refs/heads/master onto 4589efcaf3024e841825bb289bb88eb0e4f8530a diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..3c26173a8 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 4589efcaf3024e841825bb289bb88eb0e4f8530a CI 1634896936 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 new file mode 100644 index 0000000000000000000000000000000000000000..48767aa886048b23cf097a219630e55c2d620115 GIT binary patch literal 129 zcmV-{0Dk{?0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x j9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRExd__Fx36wv- literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmbO)@{K^EgdN^Fl8G literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 0000000000000000000000000000000000000000..f74bf2335bbc5999ad0faff94fb04165d8ab5c7d GIT binary patch literal 21 ccmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b new file mode 100644 index 0000000000000000000000000000000000000000..90bf4a1393aabdc89cae1baf1bf51debd33a32f0 GIT binary patch literal 160 zcmV;R0AK%j0V^p=O;s>5G+;0^FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< O6eZ?Zl>h(|AX-eiOHFnF literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a new file mode 100644 index 000000000..abf2de1e2 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a @@ -0,0 +1,2 @@ +xA +0@Q9E$3Dz$`R"~◵[t껪uUp `ȇQC,:#%qD]_*@(r*YYxC$љudtOjS/em7)D^'7[8 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b new file mode 100644 index 0000000000000000000000000000000000000000..6f4196f0d4c2b1eba402b662618a9bfbe3b255fa GIT binary patch literal 149 zcmV;G0BZku0gaA93d0}}0DJZo-V4QDb#)<>LQZ*x(Uk^b6M}{I_stV}9R_Cd*4olF zu)Fj_M5kaKB+u29B2t-Hi0e$2A`%tE*;I5uYEOr}y7s~IOz5Kn#sESgK|t}43mfBN zDF~IbQR&^E+o8uv599QZPip%rx4gBx2C^=mB}@7WV2nEHIo0J)UA1prRzdXxSIIe8 DMg>PI literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 new file mode 100644 index 000000000..08237c841 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 @@ -0,0 +1,3 @@ +xA +0@Q944cL!R"~H|*x\2&H1r8֑ +JNvfMC?bM/)0wG=&]ξu6, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/08d9b6315ddb8fb8372d83b54862ba7d7fdc88 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/08d9b6315ddb8fb8372d83b54862ba7d7fdc88 new file mode 100644 index 000000000..eb8963927 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/08d9b6315ddb8fb8372d83b54862ba7d7fdc88 @@ -0,0 +1,2 @@ +x}α +0a2箾=m \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 new file mode 100644 index 0000000000000000000000000000000000000000..7fc19f59cbcc2e293c0a9a8dd2f4d3013aaf1d13 GIT binary patch literal 138 zcmV;50CoR(0V^p=O;s>5G+;0^FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x s9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRGR5;MX|%&{r~070o;-dj;aga7~l literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/65/401620c5230dfa2ad6e0e2dcb6b447fe21262b b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/65/401620c5230dfa2ad6e0e2dcb6b447fe21262b new file mode 100644 index 0000000000000000000000000000000000000000..a48fefe985a9a6a82e2d000a0b6a72b912f82438 GIT binary patch literal 67 zcmV-J0KETr0ZYosPf{>9Vz7Y#1rJw87p{`j;t~@sTL|Dv&d*EB$xJTcvV#BxO9MmW ZB-1oKJw1io%CyX!R1*cb8USaV7L<&u8!P|- literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/69/a5c9fb912112305bfe15272855afb50f6acf4b b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/69/a5c9fb912112305bfe15272855afb50f6acf4b new file mode 100644 index 0000000000000000000000000000000000000000..f4e99e6a6cd1d95f1a893535838f336f5ec015be GIT binary patch literal 143 zcmV;A0C4|!0gaA93IZ_<06q5=xeL;?P1}Hou%~@Sj42A%U6u+y-+hADVHif2-k$@o z*2CD$plZ{S@g52@VIYc@7+X=hMaoIYm=iO*RW^GM@J%SzT*!O%Eefd$-vVObx;Lna x5h|gR&v+~wOf#IP`D$P3>&s5M^b25)sdDC+;fUzH+vz?v>`&cg_XG8gHsCi!MeYCq literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/7c/717449332e4a81f7e5643eef9c95f459444e3f b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/7c/717449332e4a81f7e5643eef9c95f459444e3f new file mode 100644 index 000000000..07becc026 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/7c/717449332e4a81f7e5643eef9c95f459444e3f @@ -0,0 +1,3 @@ +x}M +0@a9E$L2"BW=L~P0.\}|C[k͈TtILYL0QmX $,C6!z +N8J&RuyY/yWmxJ!AgkQG=FϽq ұ8q \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 new file mode 100644 index 0000000000000000000000000000000000000000..8baacd0ccd5fe2758294c8efa531a7bf282c1f13 GIT binary patch literal 134 zcmV;10D1p-0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x o9f}fDhPmt3?`-q=Vi3A+^1co0uN}YWvVRGR5;Lqy0K~gZYgBqc;s5{u literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/90/13b5f12ca8a0fdd44fbe72028500bbac5c89ee b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/90/13b5f12ca8a0fdd44fbe72028500bbac5c89ee new file mode 100644 index 0000000000000000000000000000000000000000..93173c9a076ee9f3b54d1a6f2a7e5e7a6005d031 GIT binary patch literal 156 zcmV;N0Av4n0gcW<3WG2ZK+&#qitGzzCQil#N-4PV7?Uxff>Dta+S}J7bo+UWuUoBi zvktmTJ94&?Csq(ZryL|CMlT64_{3CvR6?4lCpNnrd2N<@7K~kl{uCfW{UjbFD1rJ! zgic(+kc_P+WRm*^GE8wd9iU?rNdQP?cCpYz5<|UKWZ7s{J K&HMn8tUVVaZAicX literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae new file mode 100644 index 0000000000000000000000000000000000000000..13e3f581a83ab9bb85f981c1ced8c88be9a191f4 GIT binary patch literal 24 gcmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/ae/4e33d43751b83fbd0b6f0a1796d58462492e47 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/ae/4e33d43751b83fbd0b6f0a1796d58462492e47 new file mode 100644 index 000000000..d2952d0ad --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/ae/4e33d43751b83fbd0b6f0a1796d58462492e47 @@ -0,0 +1,2 @@ +x}α +0a7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQrz@wz%Zi^K4TyDgqi7>|VXE#=K5x J9RPa9ENwClFp~fP literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/af/4c4b2b977f8909e590ea5bc3bab59d991e4c28 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/af/4c4b2b977f8909e590ea5bc3bab59d991e4c28 new file mode 100644 index 0000000000000000000000000000000000000000..2c276bd375af0052f9fe13530ee0f4fbca53c52e GIT binary patch literal 144 zcmV;B0B`?z0gaA93c@fD06pgwdlw|T>81&Y2tD-~n{*ciV@rwP^X(J74g)iFZSC0s zQ#$os6?pMW(n65}CSN79Q4E8PN^FB?!i7bJ+$OueJH#wpvz3g5NWpV4MW&Gwvshto yQK}8a$)`Wo9i|zs(|p&jwC$yry0#nO5lA`a5aEpIy*ubJ)%8!^jqV3djW?cpK0_t| literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 new file mode 100644 index 0000000000000000000000000000000000000000..ae05cad1e9b8020cd457f6f2dbbad862ed152c53 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mDV}sySB22|cy| literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/e0/47462bda495acbe565c85b205d614f38c0a692 b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/objects/e0/47462bda495acbe565c85b205d614f38c0a692 new file mode 100644 index 0000000000000000000000000000000000000000..528db3bd1cd6c100545d2c92de01048ae3d82435 GIT binary patch literal 150 zcmV;H0BQet0gaA93c@fD06pgwxeJobZqfuqgr540&31zYV@rvkzqe2DG%(CzWNmHf z7BZdsu4;XO0VPG4D2x>XwGckTJU)9>~);(`r)=c^&)G#S%^p}$BfaQ0h}|3J*K+;nVa^l%Tv+(0PKu9 EZjjGp0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!)$TMujkpOW>f?;EZDtzUyXU4(mE6+rVMk}t>4+^^Ti-^-Q;~6)?Yh*(PjS< I01`Jz+3(>@2LJ#7 literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..7de8bfce5 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +ae4e33d43751b83fbd0b6f0a1796d58462492e47 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..06e0fc5ca --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +4589efcaf3024e841825bb289bb88eb0e4f8530a diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile1 b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile2 b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile3 b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile4 b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile4 new file mode 100644 index 000000000..9b1719f5c --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile4 @@ -0,0 +1 @@ +conflict diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile5 b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile5 new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile5 @@ -0,0 +1 @@ +test diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/myfile7 b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile7 new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected/myfile7 @@ -0,0 +1 @@ +test diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/config b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/config new file mode 100644 index 000000000..fb9626026 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractiveWithDrop/./actual diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/description b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/info/exclude b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/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/pullRebaseInteractiveWithDrop/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a new file mode 100644 index 000000000..abf2de1e2 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/45/89efcaf3024e841825bb289bb88eb0e4f8530a @@ -0,0 +1,2 @@ +xA +0@Q9E$3Dz$`R"~◵[t껪uUp `ȇQC,:#%qD]_*@(r*YYxC$љudtOjS/em7)D^'7[8 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/47/6a1939075b60aa47da50a8c40c5b4412a2f18b new file mode 100644 index 0000000000000000000000000000000000000000..6f4196f0d4c2b1eba402b662618a9bfbe3b255fa GIT binary patch literal 149 zcmV;G0BZku0gaA93d0}}0DJZo-V4QDb#)<>LQZ*x(Uk^b6M}{I_stV}9R_Cd*4olF zu)Fj_M5kaKB+u29B2t-Hi0e$2A`%tE*;I5uYEOr}y7s~IOz5Kn#sESgK|t}43mfBN zDF~IbQR&^E+o8uv599QZPip%rx4gBx2C^=mB}@7WV2nEHIo0J)UA1prRzdXxSIIe8 DMg>PI literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 new file mode 100644 index 000000000..08237c841 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/57/59b6258419271e67a172e51cd90048dd21f9c0 @@ -0,0 +1,3 @@ +xA +0@Q944cL!R"~H|*x\2&H1r8֑ +JNvfMC?bM/)0wG=&]ξu6, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/e0/47462bda495acbe565c85b205d614f38c0a692 b/test/integration/pullRebaseInteractiveWithDrop/expected_remote/objects/e0/47462bda495acbe565c85b205d614f38c0a692 new file mode 100644 index 0000000000000000000000000000000000000000..528db3bd1cd6c100545d2c92de01048ae3d82435 GIT binary patch literal 150 zcmV;H0BQet0gaA93c@fD06pgwxeJobZqfuqgr540&31zYV@rvkzqe2DG%(CzWNmHf z7BZdsu4;XO0VPG4D2x>XwGckTJU)9>~);(`r)=c^&)G#S%^p}$BfaQ0h}|3J*K+;nVa^l%Tv+(0PKu9 EZjj myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +git reset --hard HEAD~2 + +echo conflict > myfile4 +git add . +git commit -am "myfile4 conflict" + +echo test > myfile5 +git add . +git commit -am "5" + +echo test > myfile6 +git add . +git commit -am "6" + +echo test > myfile7 +git add . +git commit -am "7" + +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master + +git config pull.rebase interactive diff --git a/test/integration/pullRebaseInteractiveWithDrop/test.json b/test/integration/pullRebaseInteractiveWithDrop/test.json new file mode 100644 index 000000000..6f85ff5b7 --- /dev/null +++ b/test/integration/pullRebaseInteractiveWithDrop/test.json @@ -0,0 +1 @@ +{ "description": "When user has configured pull with interactive rebase, ensure we handle conflicts and show commits yet to be rebased", "speed": 5 } diff --git a/test/integration/push/expected/.git_keep/COMMIT_EDITMSG b/test/integration/push/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..51be8ec3d --- /dev/null +++ b/test/integration/push/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 diff --git a/test/integration/push/expected/.git_keep/FETCH_HEAD b/test/integration/push/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..ecbad2700 --- /dev/null +++ b/test/integration/push/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +547f41a06ebd3bee30fbba3f43631810fa24f1bb branch 'master' of ../actual_remote diff --git a/test/integration/push/expected/.git_keep/HEAD b/test/integration/push/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/push/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/push/expected/.git_keep/config b/test/integration/push/expected/.git_keep/config new file mode 100644 index 000000000..821803a3e --- /dev/null +++ b/test/integration/push/expected/.git_keep/config @@ -0,0 +1,16 @@ +[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 diff --git a/test/integration/push/expected/.git_keep/description b/test/integration/push/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/push/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/push/expected/.git_keep/index b/test/integration/push/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..7d490a7c8817ad1d6ced44388f2ccbc04b029e0d GIT binary patch literal 353 zcmZ?q402{*U|<4bmc*j|Ak7n}Y+*Db0|P5#MEGmZq5a89)eU*Vdw=yj=C)E(B0Hj}Q_6b244K-&Sx;YX&Ka3ib_MLmVYEgJq zf6FWF`4;LhbBv(o=xP;z1DOM&q2_!*H|KsfulAX;XK(mVDI8K4@bcH#bwnCwjxp36 zy)#}DLFRyHh&d6$=;mB9Ir<>{pV6_hSLrWKTYO21z4bZ-W{wHaoRA<_S0E+HV4`5a urJq>B%G}`GFS0Q$VsY5>B 1634897746 +1100 commit (initial): myfile1 +eb831bc1251f71f602159d98f4550e380007ca4f 547f41a06ebd3bee30fbba3f43631810fa24f1bb CI 1634897746 +1100 commit: myfile2 +547f41a06ebd3bee30fbba3f43631810fa24f1bb a09547e07257ed0456f498fde1b8214152427384 CI 1634897746 +1100 commit: myfile3 +a09547e07257ed0456f498fde1b8214152427384 a6e580c7c3c4ea40bc311466d57a946bb3f77541 CI 1634897746 +1100 commit: myfile4 diff --git a/test/integration/push/expected/.git_keep/logs/refs/heads/master b/test/integration/push/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..6c2301554 --- /dev/null +++ b/test/integration/push/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 eb831bc1251f71f602159d98f4550e380007ca4f CI 1634897746 +1100 commit (initial): myfile1 +eb831bc1251f71f602159d98f4550e380007ca4f 547f41a06ebd3bee30fbba3f43631810fa24f1bb CI 1634897746 +1100 commit: myfile2 +547f41a06ebd3bee30fbba3f43631810fa24f1bb a09547e07257ed0456f498fde1b8214152427384 CI 1634897746 +1100 commit: myfile3 +a09547e07257ed0456f498fde1b8214152427384 a6e580c7c3c4ea40bc311466d57a946bb3f77541 CI 1634897746 +1100 commit: myfile4 diff --git a/test/integration/push/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/push/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..a82757c78 --- /dev/null +++ b/test/integration/push/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 547f41a06ebd3bee30fbba3f43631810fa24f1bb CI 1634897746 +1100 fetch origin: storing head +547f41a06ebd3bee30fbba3f43631810fa24f1bb a6e580c7c3c4ea40bc311466d57a946bb3f77541 CI 1634897748 +1100 update by push diff --git a/test/integration/push/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/push/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/push/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/push/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/push/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/push/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/push/expected/.git_keep/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb b/test/integration/push/expected/.git_keep/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb new file mode 100644 index 0000000000000000000000000000000000000000..419d9ecdf19d71e53107abad2255afba89012449 GIT binary patch literal 150 zcmV;H0BQet0gcW}3c@fDfMM4;MfQTs`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/push/expected/.git_keep/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 b/test/integration/push/expected/.git_keep/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 new file mode 100644 index 000000000..e50d53ba1 --- /dev/null +++ b/test/integration/push/expected/.git_keep/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 @@ -0,0 +1,4 @@ +xM +0@a9E$󓀈H -%^-޴t}7 +*CL@1UE8b*"O3@fR 6TʩΆc +HȁD}mpwiN.%Rʪ$~7Oڧ.#Z7 \ No newline at end of file diff --git a/test/integration/push/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/push/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/push/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/push/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/push/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/push/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/push/expected/.git_keep/objects/eb/831bc1251f71f602159d98f4550e380007ca4f b/test/integration/push/expected/.git_keep/objects/eb/831bc1251f71f602159d98f4550e380007ca4f new file mode 100644 index 000000000..4acb8b3ca --- /dev/null +++ b/test/integration/push/expected/.git_keep/objects/eb/831bc1251f71f602159d98f4550e380007ca4f @@ -0,0 +1,2 @@ +xA +0@ѮsJF<ƘL")#tyS5[ SK4f"9b'X-g"9Wa1ͣ~ޛR' ;9i'w+6, \ No newline at end of file diff --git a/test/integration/push/expected/.git_keep/refs/heads/master b/test/integration/push/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..ccbf04e76 --- /dev/null +++ b/test/integration/push/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +a6e580c7c3c4ea40bc311466d57a946bb3f77541 diff --git a/test/integration/push/expected/.git_keep/refs/remotes/origin/master b/test/integration/push/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..ccbf04e76 --- /dev/null +++ b/test/integration/push/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +a6e580c7c3c4ea40bc311466d57a946bb3f77541 diff --git a/test/integration/push/expected/myfile1 b/test/integration/push/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/push/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/push/expected/myfile2 b/test/integration/push/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/push/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/push/expected/myfile3 b/test/integration/push/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/push/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/push/expected/myfile4 b/test/integration/push/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/push/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/push/expected_remote/HEAD b/test/integration/push/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/push/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/push/expected_remote/config b/test/integration/push/expected_remote/config new file mode 100644 index 000000000..26275994b --- /dev/null +++ b/test/integration/push/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/push/./actual diff --git a/test/integration/push/expected_remote/description b/test/integration/push/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/push/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/push/expected_remote/info/exclude b/test/integration/push/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/push/expected_remote/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/push/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/push/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/push/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/push/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/push/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/push/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/push/expected_remote/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb b/test/integration/push/expected_remote/objects/54/7f41a06ebd3bee30fbba3f43631810fa24f1bb new file mode 100644 index 0000000000000000000000000000000000000000..419d9ecdf19d71e53107abad2255afba89012449 GIT binary patch literal 150 zcmV;H0BQet0gcW}3c@fDfMM4;MfQTs`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/push/expected_remote/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 b/test/integration/push/expected_remote/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 new file mode 100644 index 000000000..e50d53ba1 --- /dev/null +++ b/test/integration/push/expected_remote/objects/a6/e580c7c3c4ea40bc311466d57a946bb3f77541 @@ -0,0 +1,4 @@ +xM +0@a9E$󓀈H -%^-޴t}7 +*CL@1UE8b*"O3@fR 6TʩΆc +HȁD}mpwiN.%Rʪ$~7Oڧ.#Z7 \ No newline at end of file diff --git a/test/integration/push/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/push/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/push/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/push/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/push/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/push/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/push/expected_remote/objects/eb/831bc1251f71f602159d98f4550e380007ca4f b/test/integration/push/expected_remote/objects/eb/831bc1251f71f602159d98f4550e380007ca4f new file mode 100644 index 000000000..4acb8b3ca --- /dev/null +++ b/test/integration/push/expected_remote/objects/eb/831bc1251f71f602159d98f4550e380007ca4f @@ -0,0 +1,2 @@ +xA +0@ѮsJF<ƘL")#tyS5[ SK4f"9b'X-g"9Wa1ͣ~ޛR' ;9i'w+6, \ No newline at end of file diff --git a/test/integration/push/expected_remote/packed-refs b/test/integration/push/expected_remote/packed-refs new file mode 100644 index 000000000..0c4bde9c0 --- /dev/null +++ b/test/integration/push/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +547f41a06ebd3bee30fbba3f43631810fa24f1bb refs/heads/master diff --git a/test/integration/push/expected_remote/refs/heads/master b/test/integration/push/expected_remote/refs/heads/master new file mode 100644 index 000000000..ccbf04e76 --- /dev/null +++ b/test/integration/push/expected_remote/refs/heads/master @@ -0,0 +1 @@ +a6e580c7c3c4ea40bc311466d57a946bb3f77541 diff --git a/test/integration/push/recording.json b/test/integration/push/recording.json new file mode 100644 index 000000000..62b3bfb86 --- /dev/null +++ b/test/integration/push/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":916,"Mod":0,"Key":256,"Ch":80},{"Timestamp":2131,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/push/setup.sh b/test/integration/push/setup.sh new file mode 100644 index 000000000..7d137b349 --- /dev/null +++ b/test/integration/push/setup.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +git remote add origin ../actual_remote +git fetch origin +git branch --set-upstream-to=origin/master master diff --git a/test/integration/push/test.json b/test/integration/push/test.json new file mode 100644 index 000000000..bcf197ae6 --- /dev/null +++ b/test/integration/push/test.json @@ -0,0 +1 @@ +{ "description": "push changes to the remote", "speed": 10 } diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pushAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..51be8ec3d --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/FETCH_HEAD b/test/integration/pushAndSetUpstream/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..989da164a --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +dab77371cf53420955fc9baeb84303414f7e4a60 not-for-merge branch 'master' of ../actual_remote diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/HEAD b/test/integration/pushAndSetUpstream/expected/.git_keep/HEAD new file mode 100644 index 000000000..cea9d05ed --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/test diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/config b/test/integration/pushAndSetUpstream/expected/.git_keep/config new file mode 100644 index 000000000..7b5eaec7c --- /dev/null +++ b/test/integration/pushAndSetUpstream/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/* +[push] + default = nothing +[branch "test"] + remote = origin + merge = refs/heads/test diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/description b/test/integration/pushAndSetUpstream/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/index b/test/integration/pushAndSetUpstream/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..b9df8bc716cb85dc6bef350fd481f21705bf7c3f GIT binary patch literal 353 zcmZ?q402{*U|<4bmc*j|aF+WW>@b> zzC?sZ@#H&Q2=Hp@zRJL!TbY)blWGW50MgI;$2=NFL(GW;>P0n2g6D@(gVMfpFIO!J zuj+4kr9Iz59cGRZ)Eth6xRW4rKs3~xFm!Y7XY*>GDSP&Y|CGWZbpbDbja^5iVdfY^ z&EcGS+6-h4h=!Vzj&9B+lcNv9{}~-CdzJp;w8fXC*jukdVCI+r%?Sx|bp=wA3?>Q& vT>6P6tjrD0{URIFA{K`|PjZe~I&o^DxT)K<#>nVp^%sS&|9W@t;Mx!X^agU7 literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/info/exclude b/test/integration/pushAndSetUpstream/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pushAndSetUpstream/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/pushAndSetUpstream/expected/.git_keep/logs/HEAD b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..ab1e651fb --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 65c52315dc238c164b914369f49bd70882cc1d85 CI 1634897751 +1100 commit (initial): myfile1 +65c52315dc238c164b914369f49bd70882cc1d85 dab77371cf53420955fc9baeb84303414f7e4a60 CI 1634897751 +1100 commit: myfile2 +dab77371cf53420955fc9baeb84303414f7e4a60 dbd679941d871665b7ff70fffe6116725e56e270 CI 1634897751 +1100 commit: myfile3 +dbd679941d871665b7ff70fffe6116725e56e270 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897751 +1100 commit: myfile4 +707a2a0835c897496934849bf6e0815593b140b3 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897753 +1100 checkout: moving from master to test diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/master b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..0efb79581 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 65c52315dc238c164b914369f49bd70882cc1d85 CI 1634897751 +1100 commit (initial): myfile1 +65c52315dc238c164b914369f49bd70882cc1d85 dab77371cf53420955fc9baeb84303414f7e4a60 CI 1634897751 +1100 commit: myfile2 +dab77371cf53420955fc9baeb84303414f7e4a60 dbd679941d871665b7ff70fffe6116725e56e270 CI 1634897751 +1100 commit: myfile3 +dbd679941d871665b7ff70fffe6116725e56e270 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897751 +1100 commit: myfile4 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/test b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/test new file mode 100644 index 000000000..c22f24f3c --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/heads/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897753 +1100 branch: Created from master diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..2b03e0efd --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 dab77371cf53420955fc9baeb84303414f7e4a60 CI 1634897751 +1100 fetch origin: storing head diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/test b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/test new file mode 100644 index 000000000..1e7209170 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 707a2a0835c897496934849bf6e0815593b140b3 CI 1634897754 +1100 update by push diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/65/c52315dc238c164b914369f49bd70882cc1d85 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/65/c52315dc238c164b914369f49bd70882cc1d85 new file mode 100644 index 0000000000000000000000000000000000000000..9f235e0ed21d57a8485f804ca960d67be1ba261e GIT binary patch literal 121 zcmV-<0EYi~0gcT;3WG2ZK+&#qirE)RM#o8nQVOm-#+Xc~;1H1%+S}J7bo+VmQ#D%~ zAn~Ogs^FDV@xn_OHD)5k$T?ysSOP87XQm=)=$yRUs~#}TaG&Oib?kb8<_ b2m`_u(R+8+bJFxr?(AFEP0{@THAXDof37=R literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/70/7a2a0835c897496934849bf6e0815593b140b3 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/70/7a2a0835c897496934849bf6e0815593b140b3 new file mode 100644 index 0000000000000000000000000000000000000000..3556acfa50224f40cea73caa027dad81ef6b260d GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJm_HoFOk2tD-~X}gPs#+DL6e{cPP*I@=`Tx*@1 zg^Z`Ri&(D&j4ry69EPNT0}#bjLL_1G7~)uB2D6o2p3P3fM4U6il=vqOtjbPRg#d_s zl%wH;Zt6$pMbLZ!y}US= DsPjli literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 new file mode 100644 index 0000000000000000000000000000000000000000..fd638ab157450b57e6b55150ec89b7b0f1e155d4 GIT binary patch literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$a}HB$Et?2wn9U`Ao22Y$*}+_Vx&FAMe2{Ywyd@ z!0t455uJi{kUTe2t4L#FA#Ry0MI@?-*)()OYD>Gkh9+M;TJW`?jRnYM24|1NajwC{ zh^0V{UZwYVth=6OeVyjJd{W<@aw%)SX&~z&hu}e<0gO=xJ*I~IsjL2N%TrMO0CNpF Ef@I4_t^fc4 literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/db/d679941d871665b7ff70fffe6116725e56e270 b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/db/d679941d871665b7ff70fffe6116725e56e270 new file mode 100644 index 0000000000000000000000000000000000000000..49cc241d7c7082c15747c6e4078bd7fe651cd6be GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJo*ZkiNCgr540&2|?H#+DL6e{Y}QX<(Sc$Xe^t zJPdSdyQ=RBB$V94Y=me`XvQ<3+Z+NU&raLAFkU|FS6E~haM>pDMj#SfDqhakEy1A=B|Eic`CXe6%#tB D_-I9( literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/master b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..683d3d319 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +707a2a0835c897496934849bf6e0815593b140b3 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/test b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/test new file mode 100644 index 000000000..683d3d319 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/heads/test @@ -0,0 +1 @@ +707a2a0835c897496934849bf6e0815593b140b3 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..874cd1689 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +dab77371cf53420955fc9baeb84303414f7e4a60 diff --git a/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/test b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/test new file mode 100644 index 000000000..683d3d319 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/.git_keep/refs/remotes/origin/test @@ -0,0 +1 @@ +707a2a0835c897496934849bf6e0815593b140b3 diff --git a/test/integration/pushAndSetUpstream/expected/myfile1 b/test/integration/pushAndSetUpstream/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/pushAndSetUpstream/expected/myfile2 b/test/integration/pushAndSetUpstream/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/pushAndSetUpstream/expected/myfile3 b/test/integration/pushAndSetUpstream/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/pushAndSetUpstream/expected/myfile4 b/test/integration/pushAndSetUpstream/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/pushAndSetUpstream/expected_remote/HEAD b/test/integration/pushAndSetUpstream/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pushAndSetUpstream/expected_remote/config b/test/integration/pushAndSetUpstream/expected_remote/config new file mode 100644 index 000000000..de756510f --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushAndSetUpstream/./actual diff --git a/test/integration/pushAndSetUpstream/expected_remote/description b/test/integration/pushAndSetUpstream/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushAndSetUpstream/expected_remote/info/exclude b/test/integration/pushAndSetUpstream/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected_remote/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/pushAndSetUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/65/c52315dc238c164b914369f49bd70882cc1d85 b/test/integration/pushAndSetUpstream/expected_remote/objects/65/c52315dc238c164b914369f49bd70882cc1d85 new file mode 100644 index 0000000000000000000000000000000000000000..9f235e0ed21d57a8485f804ca960d67be1ba261e GIT binary patch literal 121 zcmV-<0EYi~0gcT;3WG2ZK+&#qirE)RM#o8nQVOm-#+Xc~;1H1%+S}J7bo+VmQ#D%~ zAn~Ogs^FDV@xn_OHD)5k$T?ysSOP87XQm=)=$yRUs~#}TaG&Oib?kb8<_ b2m`_u(R+8+bJFxr?(AFEP0{@THAXDof37=R literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/70/7a2a0835c897496934849bf6e0815593b140b3 b/test/integration/pushAndSetUpstream/expected_remote/objects/70/7a2a0835c897496934849bf6e0815593b140b3 new file mode 100644 index 0000000000000000000000000000000000000000..3556acfa50224f40cea73caa027dad81ef6b260d GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJm_HoFOk2tD-~X}gPs#+DL6e{cPP*I@=`Tx*@1 zg^Z`Ri&(D&j4ry69EPNT0}#bjLL_1G7~)uB2D6o2p3P3fM4U6il=vqOtjbPRg#d_s zl%wH;Zt6$pMbLZ!y}US= DsPjli literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 b/test/integration/pushAndSetUpstream/expected_remote/objects/da/b77371cf53420955fc9baeb84303414f7e4a60 new file mode 100644 index 0000000000000000000000000000000000000000..fd638ab157450b57e6b55150ec89b7b0f1e155d4 GIT binary patch literal 150 zcmV;H0BQet0gaAJ3c@fDKwak)*$a}HB$Et?2wn9U`Ao22Y$*}+_Vx&FAMe2{Ywyd@ z!0t455uJi{kUTe2t4L#FA#Ry0MI@?-*)()OYD>Gkh9+M;TJW`?jRnYM24|1NajwC{ zh^0V{UZwYVth=6OeVyjJd{W<@aw%)SX&~z&hu}e<0gO=xJ*I~IsjL2N%TrMO0CNpF Ef@I4_t^fc4 literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/db/d679941d871665b7ff70fffe6116725e56e270 b/test/integration/pushAndSetUpstream/expected_remote/objects/db/d679941d871665b7ff70fffe6116725e56e270 new file mode 100644 index 0000000000000000000000000000000000000000..49cc241d7c7082c15747c6e4078bd7fe651cd6be GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJo*ZkiNCgr540&2|?H#+DL6e{Y}QX<(Sc$Xe^t zJPdSdyQ=RBB$V94Y=me`XvQ<3+Z+NU&raLAFkU|FS6E~haM>pDMj#SfDqhakEy1A=B|Eic`CXe6%#tB D_-I9( literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstream/expected_remote/packed-refs b/test/integration/pushAndSetUpstream/expected_remote/packed-refs new file mode 100644 index 000000000..8271e61c9 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +dab77371cf53420955fc9baeb84303414f7e4a60 refs/heads/master diff --git a/test/integration/pushAndSetUpstream/expected_remote/refs/heads/test b/test/integration/pushAndSetUpstream/expected_remote/refs/heads/test new file mode 100644 index 000000000..683d3d319 --- /dev/null +++ b/test/integration/pushAndSetUpstream/expected_remote/refs/heads/test @@ -0,0 +1 @@ +707a2a0835c897496934849bf6e0815593b140b3 diff --git a/test/integration/pushAndSetUpstream/recording.json b/test/integration/pushAndSetUpstream/recording.json new file mode 100644 index 000000000..6b209be21 --- /dev/null +++ b/test/integration/pushAndSetUpstream/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":519,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1101,"Mod":0,"Key":256,"Ch":110},{"Timestamp":1286,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1382,"Mod":0,"Key":256,"Ch":101},{"Timestamp":1574,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1613,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1814,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2430,"Mod":0,"Key":256,"Ch":80},{"Timestamp":2910,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4149,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pushAndSetUpstream/setup.sh b/test/integration/pushAndSetUpstream/setup.sh new file mode 100644 index 000000000..2911a073c --- /dev/null +++ b/test/integration/pushAndSetUpstream/setup.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +git remote add origin ../actual_remote +git fetch origin +git config push.default nothing diff --git a/test/integration/pushAndSetUpstream/test.json b/test/integration/pushAndSetUpstream/test.json new file mode 100644 index 000000000..f417f0ee5 --- /dev/null +++ b/test/integration/pushAndSetUpstream/test.json @@ -0,0 +1 @@ +{ "description": "push changes to the remote, setting upstream", "speed": 10 } diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/COMMIT_EDITMSG b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..51be8ec3d --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/FETCH_HEAD b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..adf0b729b --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +dc7117cc68b23798cabb2c388a45036da33c2f10 not-for-merge branch 'master' of ../actual_remote diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/HEAD new file mode 100644 index 000000000..cea9d05ed --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/test diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/config b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/config new file mode 100644 index 000000000..ec0727bec --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/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/* +[push] + default = current +[branch "test"] + remote = origin + merge = refs/heads/test diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/description b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/index b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..6bf05e8bb59e550ee5cc86aa8fbb0939ed7514f7 GIT binary patch literal 353 zcmZ?q402{*U|<4bmc*j|SW$_mvtTqM0|P5#L{uaLL*o(#2F9;IH6lRFwsg zzC?sZ@#H&Q2=Hp@zRJL!TbY)blWGW50M`F*!%P?rHKzdG90{HuMh!~)&b?fn_ z<(2k)3w4+|Mo@Dk48!?B=74CZIh)YUxu4CeeWvW$8~#%YhtvhU{55tRk%pOL3^hkm zOJN)kvtn5|#i_;cgl45VY4uP3t0yHNi$ki1{Nivuy7;xz) tmasB6IQNTeOp90?_B_csX6eMwQ!o6ediZ(W91k(I_FwM|=FhzL6#z}lbPE6g literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/info/exclude b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/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/pushAndSetUpstreamDefault/expected/.git_keep/logs/HEAD b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..734f642ab --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 d0e2575d4cdf78f6845db57439c7b526d02dbc7d CI 1634897757 +1100 commit (initial): myfile1 +d0e2575d4cdf78f6845db57439c7b526d02dbc7d dc7117cc68b23798cabb2c388a45036da33c2f10 CI 1634897757 +1100 commit: myfile2 +dc7117cc68b23798cabb2c388a45036da33c2f10 6552acdbb2da7b153b78bbd9f6a564a54fce1ed9 CI 1634897757 +1100 commit: myfile3 +6552acdbb2da7b153b78bbd9f6a564a54fce1ed9 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897757 +1100 commit: myfile4 +2d0011f18dcd00e21fd13ede01792048ccd09e85 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897760 +1100 checkout: moving from master to test diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/master b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..00e298ce4 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 d0e2575d4cdf78f6845db57439c7b526d02dbc7d CI 1634897757 +1100 commit (initial): myfile1 +d0e2575d4cdf78f6845db57439c7b526d02dbc7d dc7117cc68b23798cabb2c388a45036da33c2f10 CI 1634897757 +1100 commit: myfile2 +dc7117cc68b23798cabb2c388a45036da33c2f10 6552acdbb2da7b153b78bbd9f6a564a54fce1ed9 CI 1634897757 +1100 commit: myfile3 +6552acdbb2da7b153b78bbd9f6a564a54fce1ed9 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897757 +1100 commit: myfile4 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/test new file mode 100644 index 000000000..26a649f81 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/heads/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897760 +1100 branch: Created from master diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..63ed3051f --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 dc7117cc68b23798cabb2c388a45036da33c2f10 CI 1634897757 +1100 fetch origin: storing head diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/test b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/test new file mode 100644 index 000000000..8b11b4981 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/logs/refs/remotes/origin/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 2d0011f18dcd00e21fd13ede01792048ccd09e85 CI 1634897761 +1100 update by push diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 new file mode 100644 index 0000000000000000000000000000000000000000..3b028eaf70bce43bbb27f96ec30ae3570355a9b8 GIT binary patch literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQSZnwd!gB0^U^#w49!!PrtF=3LqJE)M~6OEzzob3#S?4b0X-F=1ZI<6U)?g%AZ5;Zm?dN&pF_-fPL+ii zg|HR{os*Gwf2_M5Cwm>IyMCl?Pra12-7K)jm_ndn&j8MuqaIUT|Kz59>+)1IKSzo= E(=?$*v;Y7A literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 new file mode 100644 index 0000000000000000000000000000000000000000..5e637927fa995f3a0f24c6c88635085464337135 GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJobrpXpWgr540&1QoIV@rvkzqe2DG%(CzWNmHf z7RGSuyQ=jW5(-5qH6T_FSSuI6N=_&vco`0gnvHjTbz39>B#}tjV;V^~XD>*^VQ?4= zBZ{x!48Qwh-R(5n>oni>!)<%&Mb>t+5HZl0(va*Kz&Uf+W2)<)xoO|JJQd9kDET_t D+^0l~ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d new file mode 100644 index 000000000..d93d894fa --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d @@ -0,0 +1,2 @@ +xA +0@ѮsJFǙ\yL#tyS5[ S5d"9`-gйnz4}ozKSE+ٷ7,, \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 new file mode 100644 index 0000000000000000000000000000000000000000..bd9a3df16a70b00c7cf20125c97d3562f3f600ce GIT binary patch literal 150 zcmV;H0BQet0gcW<3d0}}K+&!}h5JI$QD+oNDP)yns58<)Z9=fn-o80Px1YE8b?to_ z+9rP*yNJ%@yv-ps!z|JgCc)GSI*fqG0L3)$7S)z_c@51*AW&dmxlwEwec%$vyHu$J zKsLao607_kk9F76tgq92mrw57Q!aJwH*L}Rn1}-Dv$e*kqaIU3{^Y8E+wv4pKkM~6 EgjwE91poj5 literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/master b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..fcd0d8e35 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +2d0011f18dcd00e21fd13ede01792048ccd09e85 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/test new file mode 100644 index 000000000..fcd0d8e35 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/heads/test @@ -0,0 +1 @@ +2d0011f18dcd00e21fd13ede01792048ccd09e85 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/master b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..caea74126 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +dc7117cc68b23798cabb2c388a45036da33c2f10 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/test b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/test new file mode 100644 index 000000000..fcd0d8e35 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/.git_keep/refs/remotes/origin/test @@ -0,0 +1 @@ +2d0011f18dcd00e21fd13ede01792048ccd09e85 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/myfile1 b/test/integration/pushAndSetUpstreamDefault/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/myfile2 b/test/integration/pushAndSetUpstreamDefault/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/myfile3 b/test/integration/pushAndSetUpstreamDefault/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/pushAndSetUpstreamDefault/expected/myfile4 b/test/integration/pushAndSetUpstreamDefault/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/HEAD b/test/integration/pushAndSetUpstreamDefault/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/config b/test/integration/pushAndSetUpstreamDefault/expected_remote/config new file mode 100644 index 000000000..5f4aec3f4 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pushAndSetUpstreamDefault/./actual diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/description b/test/integration/pushAndSetUpstreamDefault/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/info/exclude b/test/integration/pushAndSetUpstreamDefault/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected_remote/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/pushAndSetUpstreamDefault/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2d/0011f18dcd00e21fd13ede01792048ccd09e85 new file mode 100644 index 0000000000000000000000000000000000000000..3b028eaf70bce43bbb27f96ec30ae3570355a9b8 GIT binary patch literal 150 zcmV;H0BQet0gcW<3c@fDKvCB@MfQSZnwd!gB0^U^#w49!!PrtF=3LqJE)M~6OEzzob3#S?4b0X-F=1ZI<6U)?g%AZ5;Zm?dN&pF_-fPL+ii zg|HR{os*Gwf2_M5Cwm>IyMCl?Pra12-7K)jm_ndn&j8MuqaIUT|Kz59>+)1IKSzo= E(=?$*v;Y7A literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/65/52acdbb2da7b153b78bbd9f6a564a54fce1ed9 new file mode 100644 index 0000000000000000000000000000000000000000..5e637927fa995f3a0f24c6c88635085464337135 GIT binary patch literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJobrpXpWgr540&1QoIV@rvkzqe2DG%(CzWNmHf z7RGSuyQ=jW5(-5qH6T_FSSuI6N=_&vco`0gnvHjTbz39>B#}tjV;V^~XD>*^VQ?4= zBZ{x!48Qwh-R(5n>oni>!)<%&Mb>t+5HZl0(va*Kz&Uf+W2)<)xoO|JJQd9kDET_t D+^0l~ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d new file mode 100644 index 000000000..d93d894fa --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d0/e2575d4cdf78f6845db57439c7b526d02dbc7d @@ -0,0 +1,2 @@ +xA +0@ѮsJFǙ\yL#tyS5[ S5d"9`-gйnz4}ozKSE+ٷ7,, \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/dc/7117cc68b23798cabb2c388a45036da33c2f10 new file mode 100644 index 0000000000000000000000000000000000000000..bd9a3df16a70b00c7cf20125c97d3562f3f600ce GIT binary patch literal 150 zcmV;H0BQet0gcW<3d0}}K+&!}h5JI$QD+oNDP)yns58<)Z9=fn-o80Px1YE8b?to_ z+9rP*yNJ%@yv-ps!z|JgCc)GSI*fqG0L3)$7S)z_c@51*AW&dmxlwEwec%$vyHu$J zKsLao607_kk9F76tgq92mrw57Q!aJwH*L}Rn1}-Dv$e*kqaIU3{^Y8E+wv4pKkM~6 EgjwE91poj5 literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pushAndSetUpstreamDefault/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/packed-refs b/test/integration/pushAndSetUpstreamDefault/expected_remote/packed-refs new file mode 100644 index 000000000..aadce3af8 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +dc7117cc68b23798cabb2c388a45036da33c2f10 refs/heads/master diff --git a/test/integration/pushAndSetUpstreamDefault/expected_remote/refs/heads/test b/test/integration/pushAndSetUpstreamDefault/expected_remote/refs/heads/test new file mode 100644 index 000000000..fcd0d8e35 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/expected_remote/refs/heads/test @@ -0,0 +1 @@ +2d0011f18dcd00e21fd13ede01792048ccd09e85 diff --git a/test/integration/pushAndSetUpstreamDefault/recording.json b/test/integration/pushAndSetUpstreamDefault/recording.json new file mode 100644 index 000000000..f3e4e79b1 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":1523,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1953,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2224,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2289,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2432,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2455,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2633,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3369,"Mod":0,"Key":256,"Ch":80},{"Timestamp":4464,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pushAndSetUpstreamDefault/setup.sh b/test/integration/pushAndSetUpstreamDefault/setup.sh new file mode 100644 index 000000000..d12f985f6 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/setup.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +git remote add origin ../actual_remote +git fetch origin +git config push.default current diff --git a/test/integration/pushAndSetUpstreamDefault/test.json b/test/integration/pushAndSetUpstreamDefault/test.json new file mode 100644 index 000000000..5b9f43bd3 --- /dev/null +++ b/test/integration/pushAndSetUpstreamDefault/test.json @@ -0,0 +1 @@ +{ "description": "push changes to the remote, setting upstream automatically based on config", "speed": 10 } diff --git a/test/integration/setUpstream/expected/.git_keep/COMMIT_EDITMSG b/test/integration/setUpstream/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..51be8ec3d --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +myfile4 diff --git a/test/integration/setUpstream/expected/.git_keep/FETCH_HEAD b/test/integration/setUpstream/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..865fc1191 --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/FETCH_HEAD @@ -0,0 +1 @@ +148a38f7ce513079d6cd40e4a02f11e46ea2ba6b branch 'master' of ../actual_remote diff --git a/test/integration/setUpstream/expected/.git_keep/HEAD b/test/integration/setUpstream/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/setUpstream/expected/.git_keep/ORIG_HEAD b/test/integration/setUpstream/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..131e55236 --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +058c8904c25889dd77ee3e817325fd1a28134037 diff --git a/test/integration/setUpstream/expected/.git_keep/config b/test/integration/setUpstream/expected/.git_keep/config new file mode 100644 index 000000000..821803a3e --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/config @@ -0,0 +1,16 @@ +[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 diff --git a/test/integration/setUpstream/expected/.git_keep/description b/test/integration/setUpstream/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/setUpstream/expected/.git_keep/index b/test/integration/setUpstream/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..9c34edeaeb6d37fc9f1bca4dad5477a1b9cb464e GIT binary patch literal 353 zcmZ?q402{*U|<4bmc*h7GbBWwC%|Y%1_oBfh!jl*hQ=if42)laYD9pTZRwuJe^pa& ze2EB+;>mZq5a89)eU*Vdw=yj=C)E(B0Hj}1;=&FX4K>FB-5d#?A4UyI`_8>wwJ5x* zzvY$od<%7$IYtn37IA#5hz6PirlIDXLpSGsHm~-XvS)AjPbnNy7x41e*mXo2W{xq; zoL_lo!R7#Is5$4+&ADW9^g;MPqhn>S(qEjm_>vTR>vags921~9AwjOLKuVIqM8SYd tKe2?Bxxu+#WMf*y;;`pQ&M`|T%K4pg)C$cy^(1^^eT3Ru^RvgfQURm6brS#p literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected/.git_keep/info/exclude b/test/integration/setUpstream/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/setUpstream/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/setUpstream/expected/.git_keep/logs/HEAD b/test/integration/setUpstream/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..0a0706f6a --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 7d7da1f440cca8d28eaf4b46e63f207993562b84 CI 1634898072 +1100 commit (initial): myfile1 +7d7da1f440cca8d28eaf4b46e63f207993562b84 058c8904c25889dd77ee3e817325fd1a28134037 CI 1634898072 +1100 commit: myfile2 +058c8904c25889dd77ee3e817325fd1a28134037 409dd039b9ec270067678ae23b710c8e4c49c458 CI 1634898072 +1100 commit: myfile3 +409dd039b9ec270067678ae23b710c8e4c49c458 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898072 +1100 commit: myfile4 +148a38f7ce513079d6cd40e4a02f11e46ea2ba6b 058c8904c25889dd77ee3e817325fd1a28134037 CI 1634898072 +1100 reset: moving to HEAD~2 +058c8904c25889dd77ee3e817325fd1a28134037 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898082 +1100 pull --no-edit: Fast-forward diff --git a/test/integration/setUpstream/expected/.git_keep/logs/refs/heads/master b/test/integration/setUpstream/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..0a0706f6a --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 7d7da1f440cca8d28eaf4b46e63f207993562b84 CI 1634898072 +1100 commit (initial): myfile1 +7d7da1f440cca8d28eaf4b46e63f207993562b84 058c8904c25889dd77ee3e817325fd1a28134037 CI 1634898072 +1100 commit: myfile2 +058c8904c25889dd77ee3e817325fd1a28134037 409dd039b9ec270067678ae23b710c8e4c49c458 CI 1634898072 +1100 commit: myfile3 +409dd039b9ec270067678ae23b710c8e4c49c458 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898072 +1100 commit: myfile4 +148a38f7ce513079d6cd40e4a02f11e46ea2ba6b 058c8904c25889dd77ee3e817325fd1a28134037 CI 1634898072 +1100 reset: moving to HEAD~2 +058c8904c25889dd77ee3e817325fd1a28134037 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898082 +1100 pull --no-edit: Fast-forward diff --git a/test/integration/setUpstream/expected/.git_keep/logs/refs/remotes/origin/master b/test/integration/setUpstream/expected/.git_keep/logs/refs/remotes/origin/master new file mode 100644 index 000000000..10925c1eb --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 148a38f7ce513079d6cd40e4a02f11e46ea2ba6b CI 1634898079 +1100 fetch origin: storing head diff --git a/test/integration/setUpstream/expected/.git_keep/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 b/test/integration/setUpstream/expected/.git_keep/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 new file mode 100644 index 000000000..ae34bb7c1 --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 @@ -0,0 +1,2 @@ +xA +0@Q9E$$"BW=Ƥ`R"~kkKwU+1+E2L*'ɮncE|Et,@RB@yǺqqG˼0qr{QrӾuy*ݜ:< \ No newline at end of file diff --git a/test/integration/setUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 b/test/integration/setUpstream/expected/.git_keep/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 new file mode 100644 index 000000000..fa4e2ebaa --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 @@ -0,0 +1,3 @@ +xA + E q4J!Ì# & x<>ﵮMCtvh@@rq%9,%eBiA#jxbƱD1DPG/%@g0nӬi~'ca@GL +`괟j귬9 \ No newline at end of file diff --git a/test/integration/setUpstream/expected/.git_keep/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 b/test/integration/setUpstream/expected/.git_keep/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 new file mode 100644 index 000000000..54afb1c5a --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 @@ -0,0 +1,3 @@ +xA +0@Q9ɤd +"BW=4`!R"~j]; fSKM2p %BCf*? i~GkKj(>8#zzL]u3t?4A, \ No newline at end of file diff --git a/test/integration/setUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected/.git_keep/refs/heads/master b/test/integration/setUpstream/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..25aa18f55 --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +148a38f7ce513079d6cd40e4a02f11e46ea2ba6b diff --git a/test/integration/setUpstream/expected/.git_keep/refs/remotes/origin/master b/test/integration/setUpstream/expected/.git_keep/refs/remotes/origin/master new file mode 100644 index 000000000..25aa18f55 --- /dev/null +++ b/test/integration/setUpstream/expected/.git_keep/refs/remotes/origin/master @@ -0,0 +1 @@ +148a38f7ce513079d6cd40e4a02f11e46ea2ba6b diff --git a/test/integration/setUpstream/expected/myfile1 b/test/integration/setUpstream/expected/myfile1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/setUpstream/expected/myfile1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/setUpstream/expected/myfile2 b/test/integration/setUpstream/expected/myfile2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/setUpstream/expected/myfile2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/setUpstream/expected/myfile3 b/test/integration/setUpstream/expected/myfile3 new file mode 100644 index 000000000..df6b0d2bc --- /dev/null +++ b/test/integration/setUpstream/expected/myfile3 @@ -0,0 +1 @@ +test3 diff --git a/test/integration/setUpstream/expected/myfile4 b/test/integration/setUpstream/expected/myfile4 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/setUpstream/expected/myfile4 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/setUpstream/expected_remote/HEAD b/test/integration/setUpstream/expected_remote/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/setUpstream/expected_remote/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/setUpstream/expected_remote/config b/test/integration/setUpstream/expected_remote/config new file mode 100644 index 000000000..1a0f699c7 --- /dev/null +++ b/test/integration/setUpstream/expected_remote/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/setUpstream/./actual diff --git a/test/integration/setUpstream/expected_remote/description b/test/integration/setUpstream/expected_remote/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/setUpstream/expected_remote/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/setUpstream/expected_remote/info/exclude b/test/integration/setUpstream/expected_remote/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/setUpstream/expected_remote/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/setUpstream/expected_remote/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 b/test/integration/setUpstream/expected_remote/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 new file mode 100644 index 000000000..ae34bb7c1 --- /dev/null +++ b/test/integration/setUpstream/expected_remote/objects/05/8c8904c25889dd77ee3e817325fd1a28134037 @@ -0,0 +1,2 @@ +xA +0@Q9E$$"BW=Ƥ`R"~kkKwU+1+E2L*'ɮncE|Et,@RB@yǺqqG˼0qr{QrӾuy*ݜ:< \ No newline at end of file diff --git a/test/integration/setUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 new file mode 100644 index 0000000000000000000000000000000000000000..7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e GIT binary patch literal 52 zcmb~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce new file mode 100644 index 0000000000000000000000000000000000000000..0a734f98100d24e67455a3cfa8497adaccc7a422 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 new file mode 100644 index 0000000000000000000000000000000000000000..31ae3f5ba89b96ad2e268134913bd913a0bc46d9 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected_remote/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 b/test/integration/setUpstream/expected_remote/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 new file mode 100644 index 000000000..fa4e2ebaa --- /dev/null +++ b/test/integration/setUpstream/expected_remote/objects/40/9dd039b9ec270067678ae23b710c8e4c49c458 @@ -0,0 +1,3 @@ +xA + E q4J!Ì# & x<>ﵮMCtvh@@rq%9,%eBiA#jxbƱD1DPG/%@g0nӬi~'ca@GL +`괟j귬9 \ No newline at end of file diff --git a/test/integration/setUpstream/expected_remote/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 b/test/integration/setUpstream/expected_remote/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 new file mode 100644 index 000000000..54afb1c5a --- /dev/null +++ b/test/integration/setUpstream/expected_remote/objects/7d/7da1f440cca8d28eaf4b46e63f207993562b84 @@ -0,0 +1,3 @@ +xA +0@Q9ɤd +"BW=4`!R"~j]; fSKM2p %BCf*? i~GkKj(>8#zzL]u3t?4A, \ No newline at end of file diff --git a/test/integration/setUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 0000000000000000000000000000000000000000..285df3e5fbab12262e28d85e78af8a31cd0024c1 GIT binary patch literal 21 ccmb`~^A08nuUMF0Q* literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 new file mode 100644 index 0000000000000000000000000000000000000000..96d2e71a6af75cdd27ac5d9628a27faecc40fb66 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/setUpstream/expected_remote/packed-refs b/test/integration/setUpstream/expected_remote/packed-refs new file mode 100644 index 000000000..a5eca4e4d --- /dev/null +++ b/test/integration/setUpstream/expected_remote/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +148a38f7ce513079d6cd40e4a02f11e46ea2ba6b refs/heads/master diff --git a/test/integration/setUpstream/recording.json b/test/integration/setUpstream/recording.json new file mode 100644 index 000000000..d4983d00b --- /dev/null +++ b/test/integration/setUpstream/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":555,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1226,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1731,"Mod":0,"Key":256,"Ch":110},{"Timestamp":1971,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2131,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2219,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2274,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2338,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2418,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2843,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3379,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3522,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3690,"Mod":0,"Key":256,"Ch":47},{"Timestamp":3947,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4105,"Mod":0,"Key":256,"Ch":99},{"Timestamp":4266,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4338,"Mod":0,"Key":256,"Ch":117},{"Timestamp":4442,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4530,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4731,"Mod":0,"Key":256,"Ch":95},{"Timestamp":4915,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4962,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5041,"Mod":0,"Key":256,"Ch":109},{"Timestamp":5090,"Mod":0,"Key":256,"Ch":111},{"Timestamp":5146,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5170,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5443,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6313,"Mod":0,"Key":256,"Ch":102},{"Timestamp":7171,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7883,"Mod":0,"Key":256,"Ch":117},{"Timestamp":8459,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9411,"Mod":0,"Key":256,"Ch":112},{"Timestamp":10298,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/setUpstream/setup.sh b/test/integration/setUpstream/setup.sh new file mode 100644 index 000000000..6a2b91419 --- /dev/null +++ b/test/integration/setUpstream/setup.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test1 > myfile1 +git add . +git commit -am "myfile1" +echo test2 > myfile2 +git add . +git commit -am "myfile2" +echo test3 > myfile3 +git add . +git commit -am "myfile3" +echo test4 > myfile4 +git add . +git commit -am "myfile4" + +cd .. +git clone --bare ./actual actual_remote + +cd actual + +git reset --hard HEAD~2 diff --git a/test/integration/setUpstream/test.json b/test/integration/setUpstream/test.json new file mode 100644 index 000000000..32b4b9d64 --- /dev/null +++ b/test/integration/setUpstream/test.json @@ -0,0 +1 @@ +{ "description": "allow setting the upstream of the current branch", "speed": 10 } diff --git a/test/runner/main.go b/test/runner/main.go index 585f26546..b122568fe 100644 --- a/test/runner/main.go +++ b/test/runner/main.go @@ -40,8 +40,8 @@ func main() { updateSnapshots, record, speedEnv, - func(_t *testing.T, expected string, actual string) { - assert.Equal(MockTestingT{}, expected, actual, fmt.Sprintf("expected:\n%s\nactual:\n%s\n", expected, actual)) + func(_t *testing.T, expected string, actual string, prefix string) { + assert.Equal(MockTestingT{}, expected, actual, fmt.Sprintf("Unexpected %s. Expected:\n%s\nActual:\n%s\n", prefix, expected, actual)) }, includeSkipped, )