From 1034962c7edad578427d056b7421c9195c29a457 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 22 Feb 2023 22:25:18 +1100 Subject: migrate more tests --- .../pullMergeConflict/expected/repo/.git_keep/logs/HEAD | 7 ------- .../expected/repo/.git_keep/logs/refs/heads/master | 7 ------- .../expected/repo/.git_keep/logs/refs/remotes/origin/master | 1 - 3 files changed, 15 deletions(-) delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master (limited to 'test/integration/pullMergeConflict/expected/repo/.git_keep/logs') diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d67e84881..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d67e84881..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 9d875f2ce..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 fetch origin: storing head -- cgit v1.2.3