summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-02-19 13:51:45 +1100
committerJesse Duffield <jessedduffield@gmail.com>2023-02-19 15:48:09 +1100
commit76a1b501f270e15cca37a54f64dbbee41ce37648 (patch)
tree635defe06d4524e34862db7f7c3c75b7657ec4a5 /test
parent7201a91b69a18c974bf2ac2f16eeff6d69bd3eeb (diff)
migrate more force push tests
Diffstat (limited to 'test')
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/HEAD1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/config8
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/description1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/info/exclude7
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin103 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe2
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin77 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/bd/739fb752ed02ccd49422196e31599c87ff90adbin149 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68bin103 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/e6/7f344f42afdb79c87a590f22537160241d8d61bin150 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5bin150 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/packed-refs3
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/refs/heads/master1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/origin/refs/heads/other_branch1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/FETCH_HEAD2
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/config21
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/description1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/indexbin209 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/HEAD10
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/master4
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/heads/other_branch3
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/master3
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch3
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin103 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe2
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin77 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/bd/739fb752ed02ccd49422196e31599c87ff90adbin149 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68bin103 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/e6/7f344f42afdb79c87a590f22537160241d8d61bin150 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/objects/fe/67c3eaf819025990d3688d5f147a064e669ca5bin150 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/heads/other_branch1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/master1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/.git_keep/refs/remotes/origin/other_branch1
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/myfile11
-rw-r--r--test/integration/forcePushMultipleMatching/expected/repo/myfile21
-rw-r--r--test/integration/forcePushMultipleMatching/recording.json1
-rw-r--r--test/integration/forcePushMultipleMatching/setup.sh54
-rw-r--r--test/integration/forcePushMultipleMatching/test.json4
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/HEAD1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/config8
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/description1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/info/exclude7
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin103 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/48/6301f318c84045827013a3c3246b8c6a319eb8bin148 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/49/ea44f3ec1792142714930c8e4c3073f137936cbin150 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/81/bdc116083cd4b4655333f4eb94dc03201970823
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin77 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/c8/4375dda9d81c1f2103defe4384e31f859dac865
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68bin103 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/packed-refs3
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/master1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/origin/refs/heads/other_branch1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/FETCH_HEAD2
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/config21
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/description1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/indexbin209 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/HEAD10
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/master4
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/heads/other_branch3
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master3
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/other_branch2
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin103 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/48/6301f318c84045827013a3c3246b8c6a319eb8bin148 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/49/ea44f3ec1792142714930c8e4c3073f137936cbin150 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/81/bdc116083cd4b4655333f4eb94dc03201970823
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin77 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/c8/4375dda9d81c1f2103defe4384e31f859dac865
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68bin103 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/heads/other_branch1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/master1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/.git_keep/refs/remotes/origin/other_branch1
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/myfile11
-rw-r--r--test/integration/forcePushMultipleUpstream/expected/repo/myfile21
-rw-r--r--test/integration/forcePushMultipleUpstream/recording.json1
-rw-r--r--test/integration/forcePushMultipleUpstream/setup.sh54
-rw-r--r--test/integration/forcePushMultipleUpstream/test.json4
106 files changed, 0 insertions, 307 deletions
diff --git a/test/integration/forcePushMultipleMatching/expected/origin/HEAD b/test/integration/forcePushMultipleMatching/expected/origin/HEAD
deleted file mode 100644
index cb089cd89..000000000
--- a/test/integration/forcePushMultipleMatching/expected/origin/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/heads/master
diff --git a/test/integration/forcePushMultipleMatching/expected/origin/config b/test/integration/forcePushMultipleMatching/expected/origin/config
deleted file mode 100644
index 41711784a..000000000
--- a/test/integration/forcePushMultipleMatching/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/forcePushMultiple/actual/./repo
diff --git a/test/integration/forcePushMultipleMatching/expected/origin/description b/test/integration/forcePushMultipleMatching/expected/origin/description
deleted file mode 100644
index 498b267a8..000000000
--- a/test/integration/forcePushMultipleMatching/expected/origin/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/forcePushMultipleMatching/expected/origin/info/exclude b/test/integration/forcePushMultipleMatching/expected/origin/info/exclude
deleted file mode 100644
index 8e9f2071f..000000000
--- a/test/integration/forcePushMultipleMatching/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/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
deleted file mode 100644
index 7f2ebf4ee..000000000
--- a/test/integration/forcePushMultipleMatching/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
+++ /dev/null
Binary files differ
diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
deleted file mode 100644
index f74bf2335..000000000
--- a/test/integration/forcePushMultipleMatching/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
+++ /dev/null
Binary files differ
diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
deleted file mode 100644
index 0a734f981..000000000
--- a/test/integration/forcePushMultipleMatching/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
+++ /dev/null
Binary files differ
diff --git a/test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6babe b/test/integration/forcePushMultipleMatching/expected/origin/objects/7a/35f0bb6bd8dc18ae462465e51f02362ba6