diff --git a/test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG index d72af3146..9daeafb98 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/patchBuilding2/expected/.git_keep/COMMIT_EDITMSG @@ -1 +1 @@ -asd +test diff --git a/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD b/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD index 48f86a0be..073c4e65c 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD +++ b/test/integration/patchBuilding2/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 +28d8e975606801b4ba31b292312d4030109e4f1a diff --git a/test/integration/patchBuilding2/expected/.git_keep/index b/test/integration/patchBuilding2/expected/.git_keep/index index ea7ff9d65..d1693a13d 100644 Binary files a/test/integration/patchBuilding2/expected/.git_keep/index and b/test/integration/patchBuilding2/expected/.git_keep/index differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD index 7bd0ac678..ee1e9a05a 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/HEAD @@ -1,7 +1,6 @@ -0000000000000000000000000000000000000000 e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 CI 1601981272 +1100 commit (initial): myfile1 -e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981272 +1100 commit: myfile2 -eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 8dd7331351a6d2b809cbab136a83f8c69abb0b4d CI 1601981272 +1100 commit: myfile2 update -8dd7331351a6d2b809cbab136a83f8c69abb0b4d 01287c3b620e4e8db2cef27436347eb4a92e0d56 CI 1601981272 +1100 commit: myfile3 -01287c3b620e4e8db2cef27436347eb4a92e0d56 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981275 +1100 reset: moving to eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 -eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981278 +1100 reset: moving to HEAD -eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 d015c882b061d63669daf4b25c918c8155d88c66 CI 1601981288 +1100 commit: asd +0000000000000000000000000000000000000000 a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 CI 1617586780 +1000 commit (initial): myfile1 +a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 5677dceabb2de40c648da3c831d037b429375131 CI 1617586780 +1000 commit: myfile2 +5677dceabb2de40c648da3c831d037b429375131 0a1e762c8cd2587e05d56acb7294937adb3b90b4 CI 1617586780 +1000 commit: myfile2 update +0a1e762c8cd2587e05d56acb7294937adb3b90b4 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586780 +1000 commit: myfile3 +28d8e975606801b4ba31b292312d4030109e4f1a 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586788 +1000 reset: moving to HEAD +28d8e975606801b4ba31b292312d4030109e4f1a 808f2484733488c2b6bd2f3773b04437bbb20434 CI 1617586799 +1000 commit: test diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master index 319c6e78e..2b2404ea1 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/heads/master @@ -1,6 +1,5 @@ -0000000000000000000000000000000000000000 e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 CI 1601981272 +1100 commit (initial): myfile1 -e96fdfcdc6bdb0e71e4d000259e59ac26532e7a1 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981272 +1100 commit: myfile2 -eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 8dd7331351a6d2b809cbab136a83f8c69abb0b4d CI 1601981272 +1100 commit: myfile2 update -8dd7331351a6d2b809cbab136a83f8c69abb0b4d 01287c3b620e4e8db2cef27436347eb4a92e0d56 CI 1601981272 +1100 commit: myfile3 -01287c3b620e4e8db2cef27436347eb4a92e0d56 eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 CI 1601981275 +1100 reset: moving to eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 -eb6ec5af0d63d4e60dc3c8d6006626a8051070e8 d015c882b061d63669daf4b25c918c8155d88c66 CI 1601981288 +1100 commit: asd +0000000000000000000000000000000000000000 a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 CI 1617586780 +1000 commit (initial): myfile1 +a08cd3e6b3dcd7e7e2741363892bd4ff8cf64822 5677dceabb2de40c648da3c831d037b429375131 CI 1617586780 +1000 commit: myfile2 +5677dceabb2de40c648da3c831d037b429375131 0a1e762c8cd2587e05d56acb7294937adb3b90b4 CI 1617586780 +1000 commit: myfile2 update +0a1e762c8cd2587e05d56acb7294937adb3b90b4 28d8e975606801b4ba31b292312d4030109e4f1a CI 1617586780 +1000 commit: myfile3 +28d8e975606801b4ba31b292312d4030109e4f1a 808f2484733488c2b6bd2f3773b04437bbb20434 CI 1617586799 +1000 commit: test diff --git a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash index f0e954b6c..e9334f7fa 100644 --- a/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash +++ b/test/integration/patchBuilding2/expected/.git_keep/logs/refs/stash @@ -1 +1 @@ -0000000000000000000000000000000000000000 f0e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e CI 1601981278 +1100 On master: asd +0000000000000000000000000000000000000000 06855901b0dbd8859a7ef5437380cef241f60187 CI 1617586788 +1000 On master: asd diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 b/test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 deleted file mode 100644 index feb982d86..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/01/287c3b620e4e8db2cef27436347eb4a92e0d56 and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 b/test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 new file mode 100644 index 000000000..29fc008b6 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/06/855901b0dbd8859a7ef5437380cef241f60187 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 b/test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 new file mode 100644 index 000000000..95d201062 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/0a/1e762c8cd2587e05d56acb7294937adb3b90b4 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a b/test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a new file mode 100644 index 000000000..0101e824a Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/28/d8e975606801b4ba31b292312d4030109e4f1a differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 b/test/integration/patchBuilding2/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 new file mode 100644 index 000000000..5b95c0039 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/47/5a06b7978eef6509efdd2a86e341992d9f2908 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/56/77dceabb2de40c648da3c831d037b429375131 b/test/integration/patchBuilding2/expected/.git_keep/objects/56/77dceabb2de40c648da3c831d037b429375131 new file mode 100644 index 000000000..7eb021d87 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/56/77dceabb2de40c648da3c831d037b429375131 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/5f/5557f5cc1bc1a0c0b617458b3642366a2c27ba b/test/integration/patchBuilding2/expected/.git_keep/objects/5f/5557f5cc1bc1a0c0b617458b3642366a2c27ba deleted file mode 100644 index 3d57ba22d..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/5f/5557f5cc1bc1a0c0b617458b3642366a2c27ba and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/60/39f2c23e9f10c8b11e82639bdceafb795ec7ab b/test/integration/patchBuilding2/expected/.git_keep/objects/60/39f2c23e9f10c8b11e82639bdceafb795ec7ab deleted file mode 100644 index fccf5e02e..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/60/39f2c23e9f10c8b11e82639bdceafb795ec7ab and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/80/8f2484733488c2b6bd2f3773b04437bbb20434 b/test/integration/patchBuilding2/expected/.git_keep/objects/80/8f2484733488c2b6bd2f3773b04437bbb20434 new file mode 100644 index 000000000..131931e6a Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/80/8f2484733488c2b6bd2f3773b04437bbb20434 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/8a/fc5e59aed0d570b89e1a658641c02b604ce71d b/test/integration/patchBuilding2/expected/.git_keep/objects/8a/fc5e59aed0d570b89e1a658641c02b604ce71d new file mode 100644 index 000000000..f60db05cc Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/8a/fc5e59aed0d570b89e1a658641c02b604ce71d differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/8d/d7331351a6d2b809cbab136a83f8c69abb0b4d b/test/integration/patchBuilding2/expected/.git_keep/objects/8d/d7331351a6d2b809cbab136a83f8c69abb0b4d deleted file mode 100644 index ed3a9ccf6..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/8d/d7331351a6d2b809cbab136a83f8c69abb0b4d and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 b/test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 deleted file mode 100644 index 449805fe8..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/93/96d8d0c471661257f6c16c1957452912c0c6f5 and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 b/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 new file mode 100644 index 000000000..0ad5f47f2 --- /dev/null +++ b/test/integration/patchBuilding2/expected/.git_keep/objects/a0/8cd3e6b3dcd7e7e2741363892bd4ff8cf64822 @@ -0,0 +1,2 @@ +xA +0@Ѯsʌ'))1P!")#tyS5[˥*`?4df 9PxKL}⧽qzm[ @B•ѝ4;eUr?4=, \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/d0/15c882b061d63669daf4b25c918c8155d88c66 b/test/integration/patchBuilding2/expected/.git_keep/objects/d0/15c882b061d63669daf4b25c918c8155d88c66 deleted file mode 100644 index b4840ded9..000000000 --- a/test/integration/patchBuilding2/expected/.git_keep/objects/d0/15c882b061d63669daf4b25c918c8155d88c66 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9E$Ic2`l<=[|]Z{tg8LDi&U, -1 K!Df Rf) cj\9d |}88+m}IvȀ!gDp{ݧɝ*8x \ No newline at end of file diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/d3/4fc4a9c0c675a5cb11d848e5afef4c89160dc0 b/test/integration/patchBuilding2/expected/.git_keep/objects/d3/4fc4a9c0c675a5cb11d848e5afef4c89160dc0 new file mode 100644 index 000000000..cbcbdde51 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/d3/4fc4a9c0c675a5cb11d848e5afef4c89160dc0 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 b/test/integration/patchBuilding2/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 new file mode 100644 index 000000000..a71694532 Binary files /dev/null and b/test/integration/patchBuilding2/expected/.git_keep/objects/e3/31050363ceb0b12d9d042e37879d892d867ea0 differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 b/test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 deleted file mode 100644 index 5452038f9..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/e9/6fdfcdc6bdb0e71e4d000259e59ac26532e7a1 and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 b/test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 deleted file mode 100644 index ab2a044f3..000000000 Binary files a/test/integration/patchBuilding2/expected/.git_keep/objects/eb/6ec5af0d63d4e60dc3c8d6006626a8051070e8 and /dev/null differ diff --git a/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e b/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e deleted file mode 100644 index b18a466b8..000000000 --- a/test/integration/patchBuilding2/expected/.git_keep/objects/f0/e63d3cbcd3bf9ca5425bab2d0b0bd09d48502e +++ /dev/null @@ -1,2 +0,0 @@ -x=j1@{ a7` \ ш"Y{i_tg673PCRE%I *9(-_nu2McТ6 ʍ