From 12ca922a410688646cfea3289b56e0fec83aae88 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 6 Apr 2021 13:54:55 +1000 Subject: [PATCH] add tests for diffing --- .../diffing/expected/.git_keep/COMMIT_EDITMSG | 1 + .../diffing/expected/.git_keep/FETCH_HEAD | 0 .../diffing/expected/.git_keep/HEAD | 1 + .../diffing/expected/.git_keep/config | 10 +++++ .../diffing/expected/.git_keep/description | 1 + .../diffing/expected/.git_keep/index | Bin 0 -> 353 bytes .../diffing/expected/.git_keep/info/exclude | 7 ++++ .../diffing/expected/.git_keep/logs/HEAD | 9 +++++ .../.git_keep/logs/refs/heads/branch2 | 5 +++ .../expected/.git_keep/logs/refs/heads/master | 4 ++ .../05/19814b4923f4639f1a47348b1539e3c5c54904 | Bin 0 -> 147 bytes .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../14/4da8a531224129210249f43dded86056891506 | 2 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../57/51731b38a36f8eb54a4bb304522ca539e04522 | Bin 0 -> 118 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../75/b31f81dd4387724638dbd3aff7380155c672cd | Bin 0 -> 148 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c | Bin 0 -> 146 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 | Bin 0 -> 146 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../d1/5e253139400c94b42fc266641d1698720d4ecf | 2 + .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../f6/77ef8a14ca2770e48129cc13acfa1c369908cc | 3 ++ .../expected/.git_keep/refs/heads/branch2 | 1 + .../expected/.git_keep/refs/heads/master | 1 + test/integration/diffing/expected/file0 | 1 + test/integration/diffing/expected/file1 | 1 + test/integration/diffing/expected/file2 | 1 + test/integration/diffing/expected/file4 | 1 + test/integration/diffing/recording.json | 1 + test/integration/diffing/setup.sh | 38 ++++++++++++++++++ test/integration/diffing/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../diffing2/expected/.git_keep/FETCH_HEAD | 0 .../diffing2/expected/.git_keep/HEAD | 1 + .../diffing2/expected/.git_keep/config | 10 +++++ .../diffing2/expected/.git_keep/description | 1 + .../diffing2/expected/.git_keep/index | Bin 0 -> 353 bytes .../diffing2/expected/.git_keep/info/exclude | 7 ++++ .../diffing2/expected/.git_keep/logs/HEAD | 9 +++++ .../.git_keep/logs/refs/heads/branch2 | 5 +++ .../expected/.git_keep/logs/refs/heads/master | 4 ++ .../06/da465196938ea235323950ee451ffb36a431cf | Bin 0 -> 148 bytes .../08/04f2069f5af172770da3d231be982ca320bf8b | Bin 0 -> 145 bytes .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1b/74d64fe4055d4502ac600072586068b27d4aa7 | 3 ++ .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../6d/04f5ed53b383c0a4c63cac168df557b6df1e44 | Bin 0 -> 147 bytes .../7b/f3d13079ced18f5b00e29c48c777e23f687d0a | Bin 0 -> 118 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a1/1d868e88adb55a48fc55ee1377b3255c0cd329 | Bin 0 -> 148 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../c6/756882cc166f52b096a5e4fb9e4f5d507870c8 | Bin 0 -> 146 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e | Bin 0 -> 147 bytes .../expected/.git_keep/refs/heads/branch2 | 1 + .../expected/.git_keep/refs/heads/master | 1 + test/integration/diffing2/expected/file0 | 1 + test/integration/diffing2/expected/file1 | 1 + test/integration/diffing2/expected/file2 | 1 + test/integration/diffing2/expected/file4 | 1 + test/integration/diffing2/recording.json | 1 + test/integration/diffing2/setup.sh | 38 ++++++++++++++++++ test/integration/diffing2/test.json | 1 + .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../diffing3/expected/.git_keep/FETCH_HEAD | 0 .../diffing3/expected/.git_keep/HEAD | 1 + .../diffing3/expected/.git_keep/config | 10 +++++ .../diffing3/expected/.git_keep/description | 1 + .../diffing3/expected/.git_keep/index | Bin 0 -> 281 bytes .../diffing3/expected/.git_keep/info/exclude | 7 ++++ .../diffing3/expected/.git_keep/logs/HEAD | 9 +++++ .../.git_keep/logs/refs/heads/branch2 | 5 +++ .../expected/.git_keep/logs/refs/heads/master | 4 ++ .../0c/2aa38e0600e0d2df09c2f84664d8a14f899879 | Bin 0 -> 36 bytes .../13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 | 2 + .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../1e/dd26fd03ee6243bd1513788874c6c57ef1d41a | 2 + .../27/5e6a821120c07a9068a9701ed14a82eeed3117 | 2 + .../2d/00bd505971a8bc7318d98e003aee708a367c85 | Bin 0 -> 24 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a | Bin 0 -> 31 bytes .../3d/b2086f780b1cf632eec29111ef395913a8ab2b | Bin 0 -> 127 bytes .../4e/2d07409901af28a47f5d3b126953a5fb8b36ee | 3 ++ .../57/695899c35539821690c4c132bd0e872a01c192 | Bin 0 -> 147 bytes .../59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 | Bin 0 -> 126 bytes .../8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 | Bin 0 -> 127 bytes .../93/b73046d6820607f1da09399b55a145d5389ab8 | Bin 0 -> 146 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b | Bin 0 -> 148 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 + .../e5/c5c5583f49a34e86ce622b59363df99e09d4c6 | Bin 0 -> 30 bytes .../e7/76522ac28860d2eba6fe98fa4fad67e798419a | Bin 0 -> 127 bytes .../ff/b13702e6bc59e2806bc3a5f93500e46925b131 | Bin 0 -> 147 bytes .../expected/.git_keep/refs/heads/branch2 | 1 + .../expected/.git_keep/refs/heads/master | 1 + test/integration/diffing3/expected/file0 | 1 + test/integration/diffing3/expected/file1 | 1 + test/integration/diffing3/expected/file2 | 1 + test/integration/diffing3/recording.json | 1 + test/integration/diffing3/setup.sh | 38 ++++++++++++++++++ test/integration/diffing3/test.json | 1 + 122 files changed, 276 insertions(+) create mode 100644 test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/diffing/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/diffing/expected/.git_keep/HEAD create mode 100644 test/integration/diffing/expected/.git_keep/config create mode 100644 test/integration/diffing/expected/.git_keep/description create mode 100644 test/integration/diffing/expected/.git_keep/index create mode 100644 test/integration/diffing/expected/.git_keep/info/exclude create mode 100644 test/integration/diffing/expected/.git_keep/logs/HEAD create mode 100644 test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/diffing/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 create mode 100644 test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 create mode 100644 test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/diffing/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/diffing/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 create mode 100644 test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd create mode 100644 test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c create mode 100644 test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 create mode 100644 test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf create mode 100644 test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc create mode 100644 test/integration/diffing/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/diffing/expected/.git_keep/refs/heads/master create mode 100644 test/integration/diffing/expected/file0 create mode 100644 test/integration/diffing/expected/file1 create mode 100644 test/integration/diffing/expected/file2 create mode 100644 test/integration/diffing/expected/file4 create mode 100644 test/integration/diffing/recording.json create mode 100644 test/integration/diffing/setup.sh create mode 100644 test/integration/diffing/test.json create mode 100644 test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/diffing2/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/diffing2/expected/.git_keep/HEAD create mode 100644 test/integration/diffing2/expected/.git_keep/config create mode 100644 test/integration/diffing2/expected/.git_keep/description create mode 100644 test/integration/diffing2/expected/.git_keep/index create mode 100644 test/integration/diffing2/expected/.git_keep/info/exclude create mode 100644 test/integration/diffing2/expected/.git_keep/logs/HEAD create mode 100644 test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/diffing2/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf create mode 100644 test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b create mode 100644 test/integration/diffing2/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/diffing2/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a create mode 100644 test/integration/diffing2/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e create mode 100644 test/integration/diffing2/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/diffing2/expected/.git_keep/refs/heads/master create mode 100644 test/integration/diffing2/expected/file0 create mode 100644 test/integration/diffing2/expected/file1 create mode 100644 test/integration/diffing2/expected/file2 create mode 100644 test/integration/diffing2/expected/file4 create mode 100644 test/integration/diffing2/recording.json create mode 100644 test/integration/diffing2/setup.sh create mode 100644 test/integration/diffing2/test.json create mode 100644 test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/diffing3/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/diffing3/expected/.git_keep/HEAD create mode 100644 test/integration/diffing3/expected/.git_keep/config create mode 100644 test/integration/diffing3/expected/.git_keep/description create mode 100644 test/integration/diffing3/expected/.git_keep/index create mode 100644 test/integration/diffing3/expected/.git_keep/info/exclude create mode 100644 test/integration/diffing3/expected/.git_keep/logs/HEAD create mode 100644 test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 create mode 100644 test/integration/diffing3/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a create mode 100644 test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/diffing3/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a create mode 100644 test/integration/diffing3/expected/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b create mode 100644 test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee create mode 100644 test/integration/diffing3/expected/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/diffing3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b create mode 100644 test/integration/diffing3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 create mode 100644 test/integration/diffing3/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a create mode 100644 test/integration/diffing3/expected/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 create mode 100644 test/integration/diffing3/expected/.git_keep/refs/heads/branch2 create mode 100644 test/integration/diffing3/expected/.git_keep/refs/heads/master create mode 100644 test/integration/diffing3/expected/file0 create mode 100644 test/integration/diffing3/expected/file1 create mode 100644 test/integration/diffing3/expected/file2 create mode 100644 test/integration/diffing3/recording.json create mode 100644 test/integration/diffing3/setup.sh create mode 100644 test/integration/diffing3/test.json diff --git a/test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +test diff --git a/test/integration/diffing/expected/.git_keep/FETCH_HEAD b/test/integration/diffing/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/diffing/expected/.git_keep/HEAD b/test/integration/diffing/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/diffing/expected/.git_keep/config b/test/integration/diffing/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/diffing/expected/.git_keep/description b/test/integration/diffing/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/diffing/expected/.git_keep/index b/test/integration/diffing/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..a119ab59ee46d59891bff4962a564b195906f617 GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1pZ8_YL){DaYqKruEw_G$)(#w834j9-CjM1YvhLd5FIf`3}u z-UT0e-?{YWqrFp2Z!xf@W#*(B0HqliK>96?tyu@7q2^3NH)rXd$A48*Z+wXejpE67 zx)9*i(tQsP9lYru^?~MqX^1%-Ea>J)@cb}pP}+Cy<*G&DRsAimwC7u>L(DNk zm~*7J6KoEUhML2UW)7z=!`^_%!WDapC2saHSiLLgGOKBYm}3GqCnU(#708feFi|kz vid^t!#>1AH<+_KXt9I=0530`k)L>I9yW-f>1!X5E@!Wq~a literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/info/exclude b/test/integration/diffing/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/diffing/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/diffing/expected/.git_keep/logs/HEAD b/test/integration/diffing/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..6d2ab7ba5 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 5751731b38a36f8eb54a4bb304522ca539e04522 CI 1617680560 +1000 commit (initial): file0 +5751731b38a36f8eb54a4bb304522ca539e04522 d15e253139400c94b42fc266641d1698720d4ecf CI 1617680560 +1000 commit: file1 +d15e253139400c94b42fc266641d1698720d4ecf 0519814b4923f4639f1a47348b1539e3c5c54904 CI 1617680560 +1000 commit: file2 +0519814b4923f4639f1a47348b1539e3c5c54904 144da8a531224129210249f43dded86056891506 CI 1617680561 +1000 commit: file4 +144da8a531224129210249f43dded86056891506 144da8a531224129210249f43dded86056891506 CI 1617680561 +1000 checkout: moving from master to branch2 +144da8a531224129210249f43dded86056891506 96a6d041bbb131df0e74d179c3adcd2ace0e7f9c CI 1617680561 +1000 commit: file4 +96a6d041bbb131df0e74d179c3adcd2ace0e7f9c 75b31f81dd4387724638dbd3aff7380155c672cd CI 1617680561 +1000 commit: file4 +75b31f81dd4387724638dbd3aff7380155c672cd f677ef8a14ca2770e48129cc13acfa1c369908cc CI 1617680561 +1000 commit: file2 +f677ef8a14ca2770e48129cc13acfa1c369908cc a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 CI 1617680570 +1000 commit: test diff --git a/test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..ea8f0f0b7 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 144da8a531224129210249f43dded86056891506 CI 1617680561 +1000 branch: Created from HEAD +144da8a531224129210249f43dded86056891506 96a6d041bbb131df0e74d179c3adcd2ace0e7f9c CI 1617680561 +1000 commit: file4 +96a6d041bbb131df0e74d179c3adcd2ace0e7f9c 75b31f81dd4387724638dbd3aff7380155c672cd CI 1617680561 +1000 commit: file4 +75b31f81dd4387724638dbd3aff7380155c672cd f677ef8a14ca2770e48129cc13acfa1c369908cc CI 1617680561 +1000 commit: file2 +f677ef8a14ca2770e48129cc13acfa1c369908cc a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 CI 1617680570 +1000 commit: test diff --git a/test/integration/diffing/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..7427bd7e9 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 5751731b38a36f8eb54a4bb304522ca539e04522 CI 1617680560 +1000 commit (initial): file0 +5751731b38a36f8eb54a4bb304522ca539e04522 d15e253139400c94b42fc266641d1698720d4ecf CI 1617680560 +1000 commit: file1 +d15e253139400c94b42fc266641d1698720d4ecf 0519814b4923f4639f1a47348b1539e3c5c54904 CI 1617680560 +1000 commit: file2 +0519814b4923f4639f1a47348b1539e3c5c54904 144da8a531224129210249f43dded86056891506 CI 1617680561 +1000 commit: file4 diff --git a/test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 b/test/integration/diffing/expected/.git_keep/objects/05/19814b4923f4639f1a47348b1539e3c5c54904 new file mode 100644 index 0000000000000000000000000000000000000000..dc7f756ddc38b7d90d284efef86797087b88c273 GIT binary patch literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)*$Xl=&1V84LRURTI+C5hnTAz@J+73HT_C8Ke{pPl>dXud^EQT}B-~-qz0)RQ`Io0(~-PC1OGCycOIW+cn BLk<7{ literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/diffing/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 0000000000000000000000000000000000000000..38acaeff2c4712a28ba59b99a0ddd33f70433acf GIT binary patch literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 b/test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 new file mode 100644 index 000000000..f0e0252c6 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/objects/14/4da8a531224129210249f43dded86056891506 @@ -0,0 +1,2 @@ +xA +0@Q9EdI2"BW=$N`l)<=[ OcWieR UKBEKəMv}"0d s@*kFdF>vuR~ 'r1=s'7my)8N \ No newline at end of file diff --git a/test/integration/diffing/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/diffing/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/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 0000000000000000000000000000000000000000..d4270c258e5362e874f0cd17fc6c260a82c41501 GIT binary patch literal 24 gcmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 b/test/integration/diffing/expected/.git_keep/objects/57/51731b38a36f8eb54a4bb304522ca539e04522 new file mode 100644 index 0000000000000000000000000000000000000000..802ec41550f19832979198dd97dff75c50723467 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iPNM35uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT0218cdrapK*` YgJZf1Gn=!Xla4>RDeDF{Kid;4>cEOP`v3p{ literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 0000000000000000000000000000000000000000..ed50454974ab7775c9d85cee55477580ac83e835 GIT binary patch literal 126 zcmV-^0D=E_0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd b/test/integration/diffing/expected/.git_keep/objects/75/b31f81dd4387724638dbd3aff7380155c672cd new file mode 100644 index 0000000000000000000000000000000000000000..e14a460c2804693555c093df93c7823ef6f7b6ac GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8#q0%{N!t8?h|pD!F_}!T(AZKUczk;Vw;yluWNU5d zK*?VEp$e{Ki_zB*F_Tp9tg6^VL|R=M6FH8YZ8kd}`tFcC`+@`IoXJtCs9`7+k~l6> zEQ_8}lNkQ=*LJ`(!+n~c`sKE-dXud^fII~sar6XNLPT@wIo0*g+|*^&!TbQW`Z_fF CElPC& literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/diffing/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 0000000000000000000000000000000000000000..2920ab335181ed440a54f52297d3cb1ab3a70222 GIT binary patch literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c b/test/integration/diffing/expected/.git_keep/objects/96/a6d041bbb131df0e74d179c3adcd2ace0e7f9c new file mode 100644 index 0000000000000000000000000000000000000000..5f97ec479b939f37ff848f632b4e9524a6c93cd1 GIT binary patch literal 146 zcmV;D0B!$x0gaA93d0}}0DJZo-V4QDchx{Cg`Dz?jc#ZlHX&H(^Xn6O9cEziUhCQ{ z40vg$s!d9HcDZmUG4U)!gu*jAjiOwXMZJ&c%^|10dq`9y341^!zyZM_4GZ~Fw4~rT zqyg9kBcJx#PdiTbK2A^lNw9bEeZi)$~u@EbFFZe*DQeS+#~k AX8-^I literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 b/test/integration/diffing/expected/.git_keep/objects/a1/00b407f33fd2e97a3cb6f62b68ed6b7cc6c676 new file mode 100644 index 0000000000000000000000000000000000000000..8c6e41957e9f9a187abe5fecf98f3cd6ea2da35a GIT binary patch literal 146 zcmV;D0B!$x0gcW<3c@fDKvCB@MfQTsq)BE1B0^U^#$=qJU~Q=pJia}G+s|8kUFP}G zJr+Fl&CI7FU|QIaBdJih>5wW(<;t<8Ks8GX3~rUpUfs7$WQ_%*N+1G@jG?IFAld|V z$fW?QI{EbbviWiH=W)8)SLXF;Ctc=?$BdL25`jM=0Jy#GQ{DdLuG_o2A7m>zv>e?@ A{{R30 literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing/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/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf b/test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf new file mode 100644 index 000000000..e6f554e7f --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/objects/d1/5e253139400c94b42fc266641d1698720d4ecf @@ -0,0 +1,2 @@ +xK +0@)f_(3Rp1&HSER+=Aw[ @Qqe%x8Z=a|Mzb!"\ iϩf^V%Hr8 \ No newline at end of file diff --git a/test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/diffing/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 0000000000000000000000000000000000000000..01ce23cee261a5c479d905ee8318e897bf4bca8f GIT binary patch literal 30 mcmb~-q%PKJUL9GL*(lMbH% literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ literal 0 HcmV?d00001 diff --git a/test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc b/test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc new file mode 100644 index 000000000..1380ed286 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/objects/f6/77ef8a14ca2770e48129cc13acfa1c369908cc @@ -0,0 +1,3 @@ +xM +0@a9Ed33cLR"x|{o- UD`Ձ*Ii]}wKiPJ|e.AjRH>#;N>NOJW=, K +9sseUo~b,9O \ No newline at end of file diff --git a/test/integration/diffing/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..dcc322cf6 --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +a100b407f33fd2e97a3cb6f62b68ed6b7cc6c676 diff --git a/test/integration/diffing/expected/.git_keep/refs/heads/master b/test/integration/diffing/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..bb48ea2cc --- /dev/null +++ b/test/integration/diffing/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +144da8a531224129210249f43dded86056891506 diff --git a/test/integration/diffing/expected/file0 b/test/integration/diffing/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/diffing/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/diffing/expected/file1 b/test/integration/diffing/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/diffing/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/diffing/expected/file2 b/test/integration/diffing/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/diffing/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/diffing/expected/file4 b/test/integration/diffing/expected/file4 new file mode 100644 index 000000000..2d00bd505 --- /dev/null +++ b/test/integration/diffing/expected/file4 @@ -0,0 +1 @@ +line one diff --git a/test/integration/diffing/recording.json b/test/integration/diffing/recording.json new file mode 100644 index 000000000..e3e075780 --- /dev/null +++ b/test/integration/diffing/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":497,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1570,"Mod":0,"Key":256,"Ch":87},{"Timestamp":1882,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2258,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2514,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3602,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5057,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5250,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5410,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6010,"Mod":2,"Key":16,"Ch":16},{"Timestamp":6730,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7106,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8090,"Mod":0,"Key":260,"Ch":0},{"Timestamp":8330,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8545,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8601,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8778,"Mod":0,"Key":256,"Ch":115},{"Timestamp":8809,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9074,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9722,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/diffing/setup.sh b/test/integration/diffing/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/diffing/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/diffing/test.json b/test/integration/diffing/test.json new file mode 100644 index 000000000..8ffc90df2 --- /dev/null +++ b/test/integration/diffing/test.json @@ -0,0 +1 @@ +{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 } diff --git a/test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..d72af3146 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +asd diff --git a/test/integration/diffing2/expected/.git_keep/FETCH_HEAD b/test/integration/diffing2/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/diffing2/expected/.git_keep/HEAD b/test/integration/diffing2/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/diffing2/expected/.git_keep/config b/test/integration/diffing2/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/diffing2/expected/.git_keep/description b/test/integration/diffing2/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/diffing2/expected/.git_keep/index b/test/integration/diffing2/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..f8944878d5ee77536fd35c0bbaff0b52cb81b43d GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1q^+|r-atY9=FP>fBFuZMx5aR~zh<5!>>5g=x>5V5+l;GfpE zcfp6=cP_p8Xzx_hTMVpenK`KjKxqaBkbYUg*~~B+YR+PGbC<{8u&g#+QiDD4u+$ z3jtm&-B%&z7{bgEF=ZFJ1~dmuL(JiqKsQH%=Z8^)(!O&qS1k&!>Th|aJ>NndVvZ5Q zoC3jjU~_;p)EsFvb2xPw_69^2uGmv7akG!X>RmyXSxqa%922lPAwjOLK!zlPiGl%F v 1617680651 +1000 commit (initial): file0 +7bf3d13079ced18f5b00e29c48c777e23f687d0a e876c3dfe2826621bea1bd3c87c2b9e2be88e69e CI 1617680651 +1000 commit: file1 +e876c3dfe2826621bea1bd3c87c2b9e2be88e69e c6756882cc166f52b096a5e4fb9e4f5d507870c8 CI 1617680651 +1000 commit: file2 +c6756882cc166f52b096a5e4fb9e4f5d507870c8 06da465196938ea235323950ee451ffb36a431cf CI 1617680651 +1000 commit: file4 +06da465196938ea235323950ee451ffb36a431cf 06da465196938ea235323950ee451ffb36a431cf CI 1617680651 +1000 checkout: moving from master to branch2 +06da465196938ea235323950ee451ffb36a431cf 6d04f5ed53b383c0a4c63cac168df557b6df1e44 CI 1617680651 +1000 commit: file4 +6d04f5ed53b383c0a4c63cac168df557b6df1e44 a11d868e88adb55a48fc55ee1377b3255c0cd329 CI 1617680651 +1000 commit: file4 +a11d868e88adb55a48fc55ee1377b3255c0cd329 1b74d64fe4055d4502ac600072586068b27d4aa7 CI 1617680651 +1000 commit: file2 +1b74d64fe4055d4502ac600072586068b27d4aa7 0804f2069f5af172770da3d231be982ca320bf8b CI 1617680662 +1000 commit: asd diff --git a/test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..a67589ac2 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 06da465196938ea235323950ee451ffb36a431cf CI 1617680651 +1000 branch: Created from HEAD +06da465196938ea235323950ee451ffb36a431cf 6d04f5ed53b383c0a4c63cac168df557b6df1e44 CI 1617680651 +1000 commit: file4 +6d04f5ed53b383c0a4c63cac168df557b6df1e44 a11d868e88adb55a48fc55ee1377b3255c0cd329 CI 1617680651 +1000 commit: file4 +a11d868e88adb55a48fc55ee1377b3255c0cd329 1b74d64fe4055d4502ac600072586068b27d4aa7 CI 1617680651 +1000 commit: file2 +1b74d64fe4055d4502ac600072586068b27d4aa7 0804f2069f5af172770da3d231be982ca320bf8b CI 1617680662 +1000 commit: asd diff --git a/test/integration/diffing2/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..c435fd1a6 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 7bf3d13079ced18f5b00e29c48c777e23f687d0a CI 1617680651 +1000 commit (initial): file0 +7bf3d13079ced18f5b00e29c48c777e23f687d0a e876c3dfe2826621bea1bd3c87c2b9e2be88e69e CI 1617680651 +1000 commit: file1 +e876c3dfe2826621bea1bd3c87c2b9e2be88e69e c6756882cc166f52b096a5e4fb9e4f5d507870c8 CI 1617680651 +1000 commit: file2 +c6756882cc166f52b096a5e4fb9e4f5d507870c8 06da465196938ea235323950ee451ffb36a431cf CI 1617680651 +1000 commit: file4 diff --git a/test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf b/test/integration/diffing2/expected/.git_keep/objects/06/da465196938ea235323950ee451ffb36a431cf new file mode 100644 index 0000000000000000000000000000000000000000..d7e70107c4b2682bcf55bbbce069ea05967ff077 GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fDMP26<*$Xm>$z%c|LRUS;WIDluv86=t_~r<1{^Gs2__DRO zcI&b~^+VOh%%GA<9fc&E{36#_5*I2IYV@ffS5IJeKJ?wKV2ViOMI7Sr1u}BfP)i;Y zmk5ax2pRtL=XTg>wzp}1=$G66(u-{EZXLRW1Q?w?I{+|)j#FL#%uQWi8q5!5BRNmg Cdq%bZ literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b b/test/integration/diffing2/expected/.git_keep/objects/08/04f2069f5af172770da3d231be982ca320bf8b new file mode 100644 index 0000000000000000000000000000000000000000..eea371cdcf02ff0a3f485b67346b44cc7b67d3aa GIT binary patch literal 145 zcmV;C0B-+y0gaA93c@fD06pgwxeKz1$?g_Jgr540O|nJ7*b*c7eDega!wgK`YJGI; zCOGt_YU3oJd17@OC=2rS4BX<*i<=Lr2Jf=~ZE#08nZNMgRZ+ literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 b/test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 new file mode 100644 index 000000000..16181d57a --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/objects/1b/74d64fe4055d4502ac600072586068b27d4aa7 @@ -0,0 +1,3 @@ +x1 +0 @>BHBCeH\#tm]!fbdBԌ" +ڤ\-Iվjh1IIݮW",&e"^j&2.ƩCr09vaa|W}[և_!zN5:/?9 \ No newline at end of file diff --git a/test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing2/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 0000000000000000000000000000000000000000..d4270c258e5362e874f0cd17fc6c260a82c41501 GIT binary patch literal 24 gcmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing2/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing2/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 0000000000000000000000000000000000000000..ed50454974ab7775c9d85cee55477580ac83e835 GIT binary patch literal 126 zcmV-^0D=E_0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 b/test/integration/diffing2/expected/.git_keep/objects/6d/04f5ed53b383c0a4c63cac168df557b6df1e44 new file mode 100644 index 0000000000000000000000000000000000000000..8728705f8ccc981927428c9a38d7429f47dc491a GIT binary patch literal 147 zcmV;E0Brww0gaAJ3d0}}K)d!7?h8eo89z`;A*&o?)R6{a6M}^vzd1s;kH_Pct@mYU zo7`m_B036|Y)U0xL!``z=$NuI5?H7Tu>b@IYUe}VLmOWiJ=x?FL}3R64iXs=B->gB z&j_|O#h>xo4n58KKFv@0a^F|Em90Ot^)~ou&WgTTV~jfKIW^=@UA1KuR6kFjIUud* BKY{=N literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a b/test/integration/diffing2/expected/.git_keep/objects/7b/f3d13079ced18f5b00e29c48c777e23f687d0a new file mode 100644 index 0000000000000000000000000000000000000000..7404048ebcfe8c65ff94f22923e5275bccbfc504 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{iPNM35uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT0218cdrapK*` YZVRDeDF{Kigs}?72iZ7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 b/test/integration/diffing2/expected/.git_keep/objects/a1/1d868e88adb55a48fc55ee1377b3255c0cd329 new file mode 100644 index 0000000000000000000000000000000000000000..8d1c80d708e07529c92be949e4155ee10b77a11e GIT binary patch literal 148 zcmV;F0Biqv0gcW<3d0}}K+&!}h5JI8adcv!ltNZHhK?f*#3lp_J$`e9Za;7FWovEe z7DspKhpMHL9Yn4}gp5*|oT|7H5w+47Mx+!|cG>Ld(08|7z}KK9P^L%%$qSPtL5`({ zFk~(j)q9gZ{k0u-n(cj>pZZO0U-c$idst)~I06T>R|Eia)^n=spWM`CRd0TQ%Q>$; CQ$!j7 literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing2/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/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 b/test/integration/diffing2/expected/.git_keep/objects/c6/756882cc166f52b096a5e4fb9e4f5d507870c8 new file mode 100644 index 0000000000000000000000000000000000000000..3869825cb0505d3244227ee7e5edad86e9db2cda GIT binary patch literal 146 zcmV;D0B!$x0gaBq3c@fD1wH30au+1KrO5_Fgr52t$>s$MjV&dDpKm|G>o5$XTWd?V z6#3E*z($Cq;EGBSE`?LgwTzB}M-2iJ;UO!l+0%h{w~*j1R1JyS-aTn3e(oFh1& zJ@^QdKK->FcAD*dnxFWlwy(J9)*hDpnHT3rvR87>nUkJV9e?VkE-Tpl0281(oXXxs AE&u=k literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 @@ -0,0 +1,2 @@ +x+)JMU03c040031QHI5`ֶww.hT[H + yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/diffing2/expected/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 new file mode 100644 index 0000000000000000000000000000000000000000..01ce23cee261a5c479d905ee8318e897bf4bca8f GIT binary patch literal 30 mcmb~-q%PKJUL9GL*(lMbH% literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing2/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e b/test/integration/diffing2/expected/.git_keep/objects/e8/76c3dfe2826621bea1bd3c87c2b9e2be88e69e new file mode 100644 index 0000000000000000000000000000000000000000..7dc95dfed69e65908fda398057c1010ada704191 GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0?{&8|Wzg`DyXv#vA{n-DDY`OOo09cEx;Yi;Qk zle_do)fQk9Ng|N4Bo4Txu<_EBeIltRH BNA>^! literal 0 HcmV?d00001 diff --git a/test/integration/diffing2/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing2/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..da38abcfa --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +0804f2069f5af172770da3d231be982ca320bf8b diff --git a/test/integration/diffing2/expected/.git_keep/refs/heads/master b/test/integration/diffing2/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..168b462cc --- /dev/null +++ b/test/integration/diffing2/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +06da465196938ea235323950ee451ffb36a431cf diff --git a/test/integration/diffing2/expected/file0 b/test/integration/diffing2/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/diffing2/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/diffing2/expected/file1 b/test/integration/diffing2/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/diffing2/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/diffing2/expected/file2 b/test/integration/diffing2/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/diffing2/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/diffing2/expected/file4 b/test/integration/diffing2/expected/file4 new file mode 100644 index 000000000..2d00bd505 --- /dev/null +++ b/test/integration/diffing2/expected/file4 @@ -0,0 +1 @@ +line one diff --git a/test/integration/diffing2/recording.json b/test/integration/diffing2/recording.json new file mode 100644 index 000000000..c560496f6 --- /dev/null +++ b/test/integration/diffing2/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":819,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1236,"Mod":0,"Key":256,"Ch":87},{"Timestamp":1491,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1899,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3115,"Mod":0,"Key":256,"Ch":87},{"Timestamp":3539,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3875,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4315,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5291,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6643,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7211,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7475,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7627,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8227,"Mod":2,"Key":16,"Ch":16},{"Timestamp":8770,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8963,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9227,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9947,"Mod":0,"Key":260,"Ch":0},{"Timestamp":10379,"Mod":0,"Key":256,"Ch":99},{"Timestamp":10635,"Mod":0,"Key":256,"Ch":97},{"Timestamp":10674,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10731,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11203,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11715,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/diffing2/setup.sh b/test/integration/diffing2/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/diffing2/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/diffing2/test.json b/test/integration/diffing2/test.json new file mode 100644 index 000000000..8ffc90df2 --- /dev/null +++ b/test/integration/diffing2/test.json @@ -0,0 +1 @@ +{ "description": "diffing two branches and making a patch from their diff files", "speed": 10 } diff --git a/test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..d72af3146 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +asd diff --git a/test/integration/diffing3/expected/.git_keep/FETCH_HEAD b/test/integration/diffing3/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/diffing3/expected/.git_keep/HEAD b/test/integration/diffing3/expected/.git_keep/HEAD new file mode 100644 index 000000000..1d57c9ea7 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/branch2 diff --git a/test/integration/diffing3/expected/.git_keep/config b/test/integration/diffing3/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/diffing3/expected/.git_keep/description b/test/integration/diffing3/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/diffing3/expected/.git_keep/index b/test/integration/diffing3/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..3af23eb398326cea9c97fb163739870d45058a5b GIT binary patch literal 281 zcmZ?q402{*U|<4b=7j8<<_g(UV_-BR0|N`2o{%;JL*o(#2F9;IH6lRFW+7sAWx+qK zZSR5)z3*Il^U>a^rneYa(=u~X4S>=N3?TiA4Qnf5G}Ig?baR&OdHh#3^~RTo&?ugK zrwajIE!|fk<`}}vv1NWzVFok@Ohe7tjBbtu&kv&prG4jKu38jc)!*_;d%lG_#2h2A zIUzx=u0Vz)gRz1E*SwD9yeDqxURuBZDr4FEiiaJ_dvtc4SNb|nsiVVf%gPg>)(5(~ IBeRYI0E{zSIsgCw literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/info/exclude b/test/integration/diffing3/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/diffing3/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/diffing3/expected/.git_keep/logs/HEAD b/test/integration/diffing3/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..0c3bb8fa2 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 CI 1617680695 +1000 commit (initial): file0 +13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 57695899c35539821690c4c132bd0e872a01c192 CI 1617680695 +1000 commit: file1 +57695899c35539821690c4c132bd0e872a01c192 4e2d07409901af28a47f5d3b126953a5fb8b36ee CI 1617680695 +1000 commit: file2 +4e2d07409901af28a47f5d3b126953a5fb8b36ee b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI 1617680695 +1000 commit: file4 +b25b8446022fb5fcded2bab1ed2b02828a5c4d0b b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI 1617680695 +1000 checkout: moving from master to branch2 +b25b8446022fb5fcded2bab1ed2b02828a5c4d0b ffb13702e6bc59e2806bc3a5f93500e46925b131 CI 1617680695 +1000 commit: file4 +ffb13702e6bc59e2806bc3a5f93500e46925b131 275e6a821120c07a9068a9701ed14a82eeed3117 CI 1617680695 +1000 commit: file4 +275e6a821120c07a9068a9701ed14a82eeed3117 1edd26fd03ee6243bd1513788874c6c57ef1d41a CI 1617680695 +1000 commit: file2 +1edd26fd03ee6243bd1513788874c6c57ef1d41a 93b73046d6820607f1da09399b55a145d5389ab8 CI 1617680702 +1000 commit: asd diff --git a/test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 b/test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 new file mode 100644 index 000000000..388d6e906 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/logs/refs/heads/branch2 @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI 1617680695 +1000 branch: Created from HEAD +b25b8446022fb5fcded2bab1ed2b02828a5c4d0b ffb13702e6bc59e2806bc3a5f93500e46925b131 CI 1617680695 +1000 commit: file4 +ffb13702e6bc59e2806bc3a5f93500e46925b131 275e6a821120c07a9068a9701ed14a82eeed3117 CI 1617680695 +1000 commit: file4 +275e6a821120c07a9068a9701ed14a82eeed3117 1edd26fd03ee6243bd1513788874c6c57ef1d41a CI 1617680695 +1000 commit: file2 +1edd26fd03ee6243bd1513788874c6c57ef1d41a 93b73046d6820607f1da09399b55a145d5389ab8 CI 1617680702 +1000 commit: asd diff --git a/test/integration/diffing3/expected/.git_keep/logs/refs/heads/master b/test/integration/diffing3/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..2eee36176 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 CI 1617680695 +1000 commit (initial): file0 +13d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 57695899c35539821690c4c132bd0e872a01c192 CI 1617680695 +1000 commit: file1 +57695899c35539821690c4c132bd0e872a01c192 4e2d07409901af28a47f5d3b126953a5fb8b36ee CI 1617680695 +1000 commit: file2 +4e2d07409901af28a47f5d3b126953a5fb8b36ee b25b8446022fb5fcded2bab1ed2b02828a5c4d0b CI 1617680695 +1000 commit: file4 diff --git a/test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/diffing3/expected/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 new file mode 100644 index 0000000000000000000000000000000000000000..38acaeff2c4712a28ba59b99a0ddd33f70433acf GIT binary patch literal 36 ucmV+<0Nej~0ZYosPf{?lWXQ?POI66vOXUJHO3L%0jEthxR4xGKxeQfIM-lJ< literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 b/test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 new file mode 100644 index 000000000..0b6ffa3fc --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/13/d8ce6d541ffd4b323376e2530ccdd3bcc7b8d5 @@ -0,0 +1,2 @@ +xA +0@Q9IDz`!Dn?j];f@v7 IUs!Hdc*\Ч\+wi4mi $dD۟ܕu3t?+ \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/diffing3/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/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/diffing3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 0000000000000000000000000000000000000000..79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a b/test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a new file mode 100644 index 000000000..d27019b84 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/1e/dd26fd03ee6243bd1513788874c6c57ef1d41a @@ -0,0 +1,2 @@ +xA +@ Fas 6#Nb~+L5rS݁3mEHJJ:"ћ5XN gx(B= P!L<1n0\-=v}u__.ʦ4D=*8͐?b9 \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 b/test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 new file mode 100644 index 000000000..4ce25a568 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/27/5e6a821120c07a9068a9701ed14a82eeed3117 @@ -0,0 +1,2 @@ +xA +0E]dfҤ("tc$qƖ#{|އZ$|i*gb -f"b bdxA)숬>e';Xv ?0/0C^@FߏJhڣn:38 \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/diffing3/expected/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 new file mode 100644 index 0000000000000000000000000000000000000000..d4270c258e5362e874f0cd17fc6c260a82c41501 GIT binary patch literal 24 gcmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/diffing3/expected/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a new file mode 100644 index 0000000000000000000000000000000000000000..65140e8b7c0189f1a7f6fc780332ce07230ba16e GIT binary patch literal 31 ncmb7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKH+(OTTc#_-_Mea=Ha+){2V^zWQe2>@J}IUIERJ#_#8 literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee b/test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee new file mode 100644 index 000000000..49d0ec6d7 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/objects/4e/2d07409901af28a47f5d3b126953a5fb8b36ee @@ -0,0 +1,3 @@ +xA +0a9ELL2#L`l)<9Ǔ[LtꇪMʜ#T +cY"$fχ1$)%& *h))Mvii~7b<ÀugnR2?/8 \ No newline at end of file diff --git a/test/integration/diffing3/expected/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 b/test/integration/diffing3/expected/.git_keep/objects/57/695899c35539821690c4c132bd0e872a01c192 new file mode 100644 index 0000000000000000000000000000000000000000..6fe16bc3d2f7ae43d8961deac5bb49dbe39367ba GIT binary patch literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-V0@Qb&XI;A*Vb;cUKxnnh-4X`OOo09cEy7Ti3Z; zm;I$5s#YKob7qEIxD+o)t#T?kHbM0W6mp>8%w7(CpCQV?N)m%>O+rPFm`Hs@U>3p3 zoa!Laluv(chaD$-AE&2&%epUm<86IdM=sF-l%u^m05B&#r@H>Bn>H`%%n#>4I!=Q& BKMVi> literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/diffing3/expected/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 new file mode 100644 index 0000000000000000000000000000000000000000..ed50454974ab7775c9d85cee55477580ac83e835 GIT binary patch literal 126 zcmV-^0D=E_0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F gDKKHsW!M`KS-4_PvBb?j2CH`kU1l|{09GbA0`7u1ssI20 literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/diffing3/expected/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 new file mode 100644 index 0000000000000000000000000000000000000000..2920ab335181ed440a54f52297d3cb1ab3a70222 GIT binary patch literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%@oj{4i=z+IQ~dszu>d{VlJw=Ub>F hDKKGpdh}?7z2{=TwsT3^k!H3(=W$*+1^{g9Id)YJJaPa4 literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 b/test/integration/diffing3/expected/.git_keep/objects/93/b73046d6820607f1da09399b55a145d5389ab8 new file mode 100644 index 0000000000000000000000000000000000000000..1dbb386fcbb4df3f4721439970d2fe36328e3b0e GIT binary patch literal 146 zcmV;D0B!$x0gaA93c@fDMP26<*$Xn0w3!h^gsyswX=Z|gv86`v_~r<1AMbsBUTb|c zk7qcv-OQhjSqL<LQc;LzDGYH@95E6z(~wgh z$qMR#;^for>+Yx7U#9tHU#Z*EPI;|YkEzcy5Cnfj0C1i5Q_cR=oxIik09XAvS?2FW A*Z=?k literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/diffing3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 0000000000000000000000000000000000000000..0e95eb06dda15fe1901a7942e7954b700b36bfa9 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/diffing3/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/diffing3/expected/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b b/test/integration/diffing3/expected/.git_keep/objects/b2/5b8446022fb5fcded2bab1ed2b02828a5c4d0b new file mode 100644 index 0000000000000000000000000000000000000000..7840a7939203b9017ef5ab786d9abbe463e55804 GIT binary patch literal 148 zcmV;F0Biqv0gaAL3c@fDMqTF=*$Xn0zezwu=&Hw z#$-XhQOq zeI20v!>^5M2W~-q%PKJUL9GL*(lMbH% literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/diffing3/expected/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a new file mode 100644 index 0000000000000000000000000000000000000000..08edf28f3f282798a9dd14ae1222a66d0c4a783a GIT binary patch literal 127 zcmV-_0D%8^0V^p=O;s>7HexU|FfcPQQAo?oNi|@w5V5+l;GfpEcfp6=cP_p8Xzx_h zTSy8F8J6yO{8u&g#+QiDD4u+$3jtm&-B*zm7%^C{T5hys-jyt=kDGjX{j7V6OEbKX h6qqpZXf5tzV|Z}sKIfqyZYehw`ghK#1OQ99IE)E{Iurl^ literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 b/test/integration/diffing3/expected/.git_keep/objects/ff/b13702e6bc59e2806bc3a5f93500e46925b131 new file mode 100644 index 0000000000000000000000000000000000000000..41ee689edc7511ff392b6defa859879a72f56bff GIT binary patch literal 147 zcmV;E0Brww0gaA93c@fD06pgwxeKz{?j{jLgr540-DHb})|L{%=Uac^X<(SclyzCA z=ED_FZ8!7Ts3?@mv8K!_M1;bMU`dRtu~^q7?A#{1y_#2K%|sCpN9D0ptEi&k2f&P3 zxKIUk@@~&{_x<2+{qV4lEZc0CvMzTYVn{JVys|$B0C0yrrkeekyK$P0+!yBJI%9s& BOa%Y{ literal 0 HcmV?d00001 diff --git a/test/integration/diffing3/expected/.git_keep/refs/heads/branch2 b/test/integration/diffing3/expected/.git_keep/refs/heads/branch2 new file mode 100644 index 000000000..0fd67f431 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/refs/heads/branch2 @@ -0,0 +1 @@ +93b73046d6820607f1da09399b55a145d5389ab8 diff --git a/test/integration/diffing3/expected/.git_keep/refs/heads/master b/test/integration/diffing3/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..1ae5bbe93 --- /dev/null +++ b/test/integration/diffing3/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +b25b8446022fb5fcded2bab1ed2b02828a5c4d0b diff --git a/test/integration/diffing3/expected/file0 b/test/integration/diffing3/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/diffing3/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/diffing3/expected/file1 b/test/integration/diffing3/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/diffing3/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/diffing3/expected/file2 b/test/integration/diffing3/expected/file2 new file mode 100644 index 000000000..180cf8328 --- /dev/null +++ b/test/integration/diffing3/expected/file2 @@ -0,0 +1 @@ +test2 diff --git a/test/integration/diffing3/recording.json b/test/integration/diffing3/recording.json new file mode 100644 index 000000000..3075a9b2f --- /dev/null +++ b/test/integration/diffing3/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":487,"Mod":0,"Key":259,"Ch":0},{"Timestamp":768,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1039,"Mod":0,"Key":256,"Ch":87},{"Timestamp":1303,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1599,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1791,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1975,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2151,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2384,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3335,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3527,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3679,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4214,"Mod":2,"Key":16,"Ch":16},{"Timestamp":5111,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5327,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6006,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6223,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6447,"Mod":0,"Key":256,"Ch":99},{"Timestamp":6631,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6671,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6743,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7111,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7559,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/diffing3/setup.sh b/test/integration/diffing3/setup.sh new file mode 100644 index 000000000..327d4594f --- /dev/null +++ b/test/integration/diffing3/setup.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +echo test0 > file0 +git add . +git commit -am file0 + +echo test1 > file1 +git add . +git commit -am file1 + +echo test2 > file2 +git add . +git commit -am file2 + +echo "line one" > file4 +git add . +git commit -am file4 + +git checkout -b branch2 + +echo "line two" >> file4 +git add . +git commit -am file4 + +echo "line three" >> file4 +git add . +git commit -am file4 + +echo "line two" >> file2 +git add . +git commit -am file2 diff --git a/test/integration/diffing3/test.json b/test/integration/diffing3/test.json new file mode 100644 index 000000000..7ce255921 --- /dev/null +++ b/test/integration/diffing3/test.json @@ -0,0 +1 @@ +{ "description": "diffing two branches and making a patch from their diff files", "speed": 1 }