diff --git a/pkg/integration/tests/sync/pull.go b/pkg/integration/tests/sync/pull.go new file mode 100644 index 000000000..d33f4687d --- /dev/null +++ b/pkg/integration/tests/sync/pull.go @@ -0,0 +1,43 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Pull = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull a commit from the remote", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.UserConfig.Git.AutoFetch = false + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + + shell.CloneIntoRemote("origin") + shell.SetBranchUpstream("master", "origin/master") + + // remove the 'two' commit so that we have something to pull from the remote + shell.HardReset("HEAD^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓1 repo → master")) + + t.Views().Files().IsFocused().Press(keys.Universal.Pull) + + t.Views().Commits(). + Lines( + Contains("two"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("✓ repo → master")) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index f9b2631a1..34b535894 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -72,5 +72,6 @@ var tests = []*components.IntegrationTest{ submodule.Remove, submodule.Reset, sync.FetchPrune, + sync.Pull, sync.RenameBranchAndPull, } diff --git a/test/integration/pull/expected/origin/HEAD b/test/integration/pull/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pull/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pull/expected/origin/config b/test/integration/pull/expected/origin/config deleted file mode 100644 index e92bfb417..000000000 --- a/test/integration/pull/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pull/actual/./repo diff --git a/test/integration/pull/expected/origin/description b/test/integration/pull/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pull/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pull/expected/origin/info/exclude b/test/integration/pull/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pull/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pull/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pull/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pull/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pull/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pull/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pull/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pull/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pull/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pull/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 b/test/integration/pull/expected/origin/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 deleted file mode 100644 index a56e97735..000000000 --- a/test/integration/pull/expected/origin/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJƌJ\yL")#tyS5[ Sᮒ` PL%s^ui4=$p;9i'w+49, \ No newline at end of file diff --git a/test/integration/pull/expected/origin/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 b/test/integration/pull/expected/origin/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 deleted file mode 100644 index a03a86b26..000000000 Binary files a/test/integration/pull/expected/origin/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 b/test/integration/pull/expected/origin/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 deleted file mode 100644 index 6921642c3..000000000 Binary files a/test/integration/pull/expected/origin/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pull/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pull/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pull/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pull/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pull/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pull/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pull/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pull/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pull/expected/origin/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 b/test/integration/pull/expected/origin/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 deleted file mode 100644 index 0277b216d..000000000 --- a/test/integration/pull/expected/origin/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 +++ /dev/null @@ -1,3 +0,0 @@ -xA - E q4*R*qj]}x֮!S?-Ud"J4 %?XWס@SJA` c - =/:/w?B[i\D' `tW'}; \ No newline at end of file diff --git a/test/integration/pull/expected/origin/packed-refs b/test/integration/pull/expected/origin/packed-refs deleted file mode 100644 index b9e906164..000000000 --- a/test/integration/pull/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -97bf06c598032ab5ad0faf744c91545071f3cb38 refs/heads/master diff --git a/test/integration/pull/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pull/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/pull/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/pull/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pull/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 872d125b1..000000000 --- a/test/integration/pull/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -97bf06c598032ab5ad0faf744c91545071f3cb38 branch 'master' of ../origin diff --git a/test/integration/pull/expected/repo/.git_keep/HEAD b/test/integration/pull/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pull/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pull/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pull/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 480b52b43..000000000 --- a/test/integration/pull/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -7b9a91f4ecba02fd55dbf3f372bc3faee3897939 diff --git a/test/integration/pull/expected/repo/.git_keep/config b/test/integration/pull/expected/repo/.git_keep/config deleted file mode 100644 index 7721ae814..000000000 --- a/test/integration/pull/expected/repo/.git_keep/config +++ /dev/null @@ -1,16 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/pull/expected/repo/.git_keep/description b/test/integration/pull/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pull/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pull/expected/repo/.git_keep/index b/test/integration/pull/expected/repo/.git_keep/index deleted file mode 100644 index b5f0f25a7..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/info/exclude b/test/integration/pull/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pull/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pull/expected/repo/.git_keep/logs/HEAD b/test/integration/pull/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index f67583b72..000000000 --- a/test/integration/pull/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 3ea0c134bed03d0a2cb7eeaff586af277d137129 CI 1648348653 +1100 commit (initial): myfile1 -3ea0c134bed03d0a2cb7eeaff586af277d137129 7b9a91f4ecba02fd55dbf3f372bc3faee3897939 CI 1648348653 +1100 commit: myfile2 -7b9a91f4ecba02fd55dbf3f372bc3faee3897939 f0eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 CI 1648348653 +1100 commit: myfile3 -f0eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348653 +1100 commit: myfile4 -97bf06c598032ab5ad0faf744c91545071f3cb38 7b9a91f4ecba02fd55dbf3f372bc3faee3897939 CI 1648348653 +1100 reset: moving to HEAD~2 -7b9a91f4ecba02fd55dbf3f372bc3faee3897939 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348654 +1100 rebase -i (start): checkout 97bf06c598032ab5ad0faf744c91545071f3cb38 -97bf06c598032ab5ad0faf744c91545071f3cb38 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348654 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pull/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pull/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index bbbd7e2e5..000000000 --- a/test/integration/pull/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 3ea0c134bed03d0a2cb7eeaff586af277d137129 CI 1648348653 +1100 commit (initial): myfile1 -3ea0c134bed03d0a2cb7eeaff586af277d137129 7b9a91f4ecba02fd55dbf3f372bc3faee3897939 CI 1648348653 +1100 commit: myfile2 -7b9a91f4ecba02fd55dbf3f372bc3faee3897939 f0eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 CI 1648348653 +1100 commit: myfile3 -f0eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348653 +1100 commit: myfile4 -97bf06c598032ab5ad0faf744c91545071f3cb38 7b9a91f4ecba02fd55dbf3f372bc3faee3897939 CI 1648348653 +1100 reset: moving to HEAD~2 -7b9a91f4ecba02fd55dbf3f372bc3faee3897939 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348654 +1100 rebase -i (finish): refs/heads/master onto 97bf06c598032ab5ad0faf744c91545071f3cb38 diff --git a/test/integration/pull/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pull/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 69650cb95..000000000 --- a/test/integration/pull/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 97bf06c598032ab5ad0faf744c91545071f3cb38 CI 1648348653 +1100 fetch origin: storing head diff --git a/test/integration/pull/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pull/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pull/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pull/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pull/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 b/test/integration/pull/expected/repo/.git_keep/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 deleted file mode 100644 index a56e97735..000000000 --- a/test/integration/pull/expected/repo/.git_keep/objects/3e/a0c134bed03d0a2cb7eeaff586af277d137129 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJƌJ\yL")#tyS5[ Sᮒ` PL%s^ui4=$p;9i'w+49, \ No newline at end of file diff --git a/test/integration/pull/expected/repo/.git_keep/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 b/test/integration/pull/expected/repo/.git_keep/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 deleted file mode 100644 index a03a86b26..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/7b/9a91f4ecba02fd55dbf3f372bc3faee3897939 and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 b/test/integration/pull/expected/repo/.git_keep/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 deleted file mode 100644 index 6921642c3..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/97/bf06c598032ab5ad0faf744c91545071f3cb38 and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pull/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pull/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pull/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pull/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pull/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pull/expected/repo/.git_keep/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 b/test/integration/pull/expected/repo/.git_keep/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 deleted file mode 100644 index 0277b216d..000000000 --- a/test/integration/pull/expected/repo/.git_keep/objects/f0/eb4a85b26f51dc8c23e31bb7f541f0e2d1d2d0 +++ /dev/null @@ -1,3 +0,0 @@ -xA - E q4*R*qj]}x֮!S?-Ud"J4 %?XWס@SJA` c - =/:/w?B[i\D' `tW'}; \ No newline at end of file diff --git a/test/integration/pull/expected/repo/.git_keep/refs/heads/master b/test/integration/pull/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 49859b120..000000000 --- a/test/integration/pull/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -97bf06c598032ab5ad0faf744c91545071f3cb38 diff --git a/test/integration/pull/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pull/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 49859b120..000000000 --- a/test/integration/pull/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -97bf06c598032ab5ad0faf744c91545071f3cb38 diff --git a/test/integration/pull/expected/repo/myfile1 b/test/integration/pull/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pull/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pull/expected/repo/myfile2 b/test/integration/pull/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pull/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pull/expected/repo/myfile3 b/test/integration/pull/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pull/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pull/expected/repo/myfile4 b/test/integration/pull/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pull/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pull/recording.json b/test/integration/pull/recording.json deleted file mode 100644 index 9aa74c150..000000000 --- a/test/integration/pull/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"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 deleted file mode 100644 index 34646d663..000000000 --- a/test/integration/pull/setup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -set -e - -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 ./repo origin - -cd repo - -# 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 ../origin -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 deleted file mode 100644 index 93a03aaea..000000000 --- a/test/integration/pull/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "pull changes from the remote", "speed": 10 }