From cf99b47ec02815b1c9965de113fe9e8a4bb4afd0 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 6 Apr 2021 10:30:32 +1000 Subject: [PATCH] another filter path test --- .../expected/.git_keep/COMMIT_EDITMSG | 1 + .../filterPath3/expected/.git_keep/FETCH_HEAD | 0 .../filterPath3/expected/.git_keep/HEAD | 1 + .../filterPath3/expected/.git_keep/config | 10 ++++++ .../expected/.git_keep/description | 1 + .../filterPath3/expected/.git_keep/index | Bin 0 -> 353 bytes .../expected/.git_keep/info/exclude | 7 ++++ .../filterPath3/expected/.git_keep/logs/HEAD | 6 ++++ .../expected/.git_keep/logs/refs/heads/master | 6 ++++ .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 0 -> 21 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 0 -> 50 bytes .../2c/7b461ce430e2d743ee239f0c994fd60f90c863 | Bin 0 -> 154 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 0 -> 21 bytes .../76/ff9510a110483d5de27a6d2c1b1a0e82207431 | 2 ++ .../77/9de836a10ac879fa919f48d5dc4f4ce11528e2 | Bin 0 -> 101 bytes .../84/b823dc5fc92fcf08eb8c8545716232ce49bd45 | Bin 0 -> 106 bytes .../87/1d1c0423b07670f34db0ca48738dcec548512e | Bin 0 -> 148 bytes .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 0 -> 101 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 0 -> 21 bytes .../a6/68d8690712ac945055bd187ed70fd10541dd38 | Bin 0 -> 146 bytes .../ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 | Bin 0 -> 147 bytes .../c8/68546458601b9c71b76b893f9020ecf7405528 | Bin 0 -> 106 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 ++ .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 0 -> 21 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 0 -> 21 bytes .../e9/2eec6edb251fbc68435ffd5cd7a52f886f062d | Bin 0 -> 118 bytes .../expected/.git_keep/refs/heads/master | 1 + test/integration/filterPath3/expected/file | 1 + test/integration/filterPath3/expected/file0 | 1 + test/integration/filterPath3/expected/file1 | 1 + test/integration/filterPath3/expected/file2 | 1 + test/integration/filterPath3/recording.json | 1 + test/integration/filterPath3/setup.sh | 31 ++++++++++++++++++ test/integration/filterPath3/test.json | 1 + 34 files changed, 74 insertions(+) create mode 100644 test/integration/filterPath3/expected/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration/filterPath3/expected/.git_keep/FETCH_HEAD create mode 100644 test/integration/filterPath3/expected/.git_keep/HEAD create mode 100644 test/integration/filterPath3/expected/.git_keep/config create mode 100644 test/integration/filterPath3/expected/.git_keep/description create mode 100644 test/integration/filterPath3/expected/.git_keep/index create mode 100644 test/integration/filterPath3/expected/.git_keep/info/exclude create mode 100644 test/integration/filterPath3/expected/.git_keep/logs/HEAD create mode 100644 test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/2c/7b461ce430e2d743ee239f0c994fd60f90c863 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/a6/68d8690712ac945055bd187ed70fd10541dd38 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b create mode 100644 test/integration/filterPath3/expected/.git_keep/objects/e9/2eec6edb251fbc68435ffd5cd7a52f886f062d create mode 100644 test/integration/filterPath3/expected/.git_keep/refs/heads/master create mode 100644 test/integration/filterPath3/expected/file create mode 100644 test/integration/filterPath3/expected/file0 create mode 100644 test/integration/filterPath3/expected/file1 create mode 100644 test/integration/filterPath3/expected/file2 create mode 100644 test/integration/filterPath3/recording.json create mode 100644 test/integration/filterPath3/setup.sh create mode 100644 test/integration/filterPath3/test.json diff --git a/test/integration/filterPath3/expected/.git_keep/COMMIT_EDITMSG b/test/integration/filterPath3/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +test diff --git a/test/integration/filterPath3/expected/.git_keep/FETCH_HEAD b/test/integration/filterPath3/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/filterPath3/expected/.git_keep/HEAD b/test/integration/filterPath3/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/filterPath3/expected/.git_keep/config b/test/integration/filterPath3/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/filterPath3/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/filterPath3/expected/.git_keep/description b/test/integration/filterPath3/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/filterPath3/expected/.git_keep/index b/test/integration/filterPath3/expected/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..9dbc3068bf1d80e1da2a09a9cc6846258f0aa575 GIT binary patch literal 353 zcmZ?q402{*U|<4bmW1rpRlG*p%rKe}D8{CivR@P9_f z%3h_vIBoGIDfZUu5C)dC%$!u9ED(V7b4)J&1*4(nWTBg5A!2o9!9T5S?}87#?_7HG z(cY=1w-{JK<`}@tX}5I#wgPAln1-5j5#5}ndmjH)O}+6YA~cF8-|0etS4;O*h&hHZ zbE&A{RD+K e-yK3VI3m}ze`H`?Fx%?nw<%Sn0W&IQbOHeR)OS4q literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/info/exclude b/test/integration/filterPath3/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/filterPath3/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/filterPath3/expected/.git_keep/logs/HEAD b/test/integration/filterPath3/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..c84dc4885 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 e92eec6edb251fbc68435ffd5cd7a52f886f062d CI 1617668986 +1000 commit (initial): file0 +e92eec6edb251fbc68435ffd5cd7a52f886f062d 76ff9510a110483d5de27a6d2c1b1a0e82207431 CI 1617668986 +1000 commit: file1 +76ff9510a110483d5de27a6d2c1b1a0e82207431 a668d8690712ac945055bd187ed70fd10541dd38 CI 1617668986 +1000 commit: file2 +a668d8690712ac945055bd187ed70fd10541dd38 2c7b461ce430e2d743ee239f0c994fd60f90c863 CI 1617668986 +1000 commit: file1 and file2 +2c7b461ce430e2d743ee239f0c994fd60f90c863 ac8bf479b326a578d74ca8fa9d3a9d2c86188770 CI 1617668986 +1000 commit: file +ac8bf479b326a578d74ca8fa9d3a9d2c86188770 871d1c0423b07670f34db0ca48738dcec548512e CI 1617669005 +1000 commit: test diff --git a/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..c84dc4885 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 e92eec6edb251fbc68435ffd5cd7a52f886f062d CI 1617668986 +1000 commit (initial): file0 +e92eec6edb251fbc68435ffd5cd7a52f886f062d 76ff9510a110483d5de27a6d2c1b1a0e82207431 CI 1617668986 +1000 commit: file1 +76ff9510a110483d5de27a6d2c1b1a0e82207431 a668d8690712ac945055bd187ed70fd10541dd38 CI 1617668986 +1000 commit: file2 +a668d8690712ac945055bd187ed70fd10541dd38 2c7b461ce430e2d743ee239f0c994fd60f90c863 CI 1617668986 +1000 commit: file1 and file2 +2c7b461ce430e2d743ee239f0c994fd60f90c863 ac8bf479b326a578d74ca8fa9d3a9d2c86188770 CI 1617668986 +1000 commit: file +ac8bf479b326a578d74ca8fa9d3a9d2c86188770 871d1c0423b07670f34db0ca48738dcec548512e CI 1617669005 +1000 commit: test diff --git a/test/integration/filterPath3/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/filterPath3/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/filterPath3/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/filterPath3/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/filterPath3/expected/.git_keep/objects/2c/7b461ce430e2d743ee239f0c994fd60f90c863 b/test/integration/filterPath3/expected/.git_keep/objects/2c/7b461ce430e2d743ee239f0c994fd60f90c863 new file mode 100644 index 0000000000000000000000000000000000000000..1d4480f0852ef76ebd79f89bc6f6d4ce9eb9bfa3 GIT binary patch literal 154 zcmV;L0A>Gp0gaAL3c^4PMqSS-vKJ(o&QAtJgswbBoMf7^ zlrRQT9oWgcKb8%~8=S}6)jl$>Pdn9Rz5pf4d!}%LBO#*O>3*u)pSo+)(+K3H@LS$} I0eDb6MB55QoB#j- literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/filterPath3/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 0000000000000000000000000000000000000000..06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c GIT binary patch literal 21 ccmb|y2)08mZ`J^%m! literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 b/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 new file mode 100644 index 000000000..f28004818 --- /dev/null +++ b/test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431 @@ -0,0 +1,2 @@ +xM +0@a9Ed3I@DǘN&XhL)<=Ƿx[[l/Dd&.)ZXggNlE,6)1yj-K`kJX ڢ3^Ӭ/}ЀSN`Qg=U]7: \ No newline at end of file diff --git a/test/integration/filterPath3/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 b/test/integration/filterPath3/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 new file mode 100644 index 0000000000000000000000000000000000000000..ad968bd2faee3437d9a46d3b444edfe484933b81 GIT binary patch literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%Y?q~CApDBCxhX0hpA$0*Se~n#7q>&UDF7He@g~FfcPQQAo?oNoBZXa`Zv?Kci!1uhL(fw)m11d+T)w zlDq+fg^1Oa1^=|Ry$e3{zH{l#M|-E5-a=Af$Z$WKSNlxavp4*w6b`8ic=>DWIwFmv MzzC}q0NVUKm*jmiwEzGB literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e b/test/integration/filterPath3/expected/.git_keep/objects/87/1d1c0423b07670f34db0ca48738dcec548512e new file mode 100644 index 0000000000000000000000000000000000000000..a1c1892c93ae55868d5472d5f303addd1b1a285a GIT binary patch literal 148 zcmV;F0Biqv0gaA93IZ_=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/filterPath3/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/filterPath3/expected/.git_keep/objects/a6/68d8690712ac945055bd187ed70fd10541dd38 b/test/integration/filterPath3/expected/.git_keep/objects/a6/68d8690712ac945055bd187ed70fd10541dd38 new file mode 100644 index 0000000000000000000000000000000000000000..764edf66f7bd6774efea7b06173076e1a1d83a52 GIT binary patch literal 146 zcmV;D0B!$x0gaA93WG2Z0DI0WaxawKRg(>rQt;$6*6fA~ri!G{=hr9nIt;_)t=6S^ zOmu07nNP+n5j3+hsgjhr=l~dlmB@z7)XkZ)+vTu#^D&f?1_VKbo;w}XC`wSuIHQ0u z5yZYjC!hA(4nI!*K2A^jO5Inx<*hzEhBF^Haqw3J0C&=Js@b2qE6Zx+euXnRb7UPy AP5=M^ literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 b/test/integration/filterPath3/expected/.git_keep/objects/ac/8bf479b326a578d74ca8fa9d3a9d2c86188770 new file mode 100644 index 0000000000000000000000000000000000000000..d725a9a7eb52dd60159265153a2d328d4a2555f1 GIT binary patch literal 147 zcmV;E0Brww0gcX03c@fDKw;N8MfQSB{w6aZB6QVbG?NJyT3bp4k8h9Q_Tw#{Z0kCA z>)2iTp=v1>@}Wvsk(kh49RQe9&#A6|=BCYynja|*IWo1w BMg{-? literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 b/test/integration/filterPath3/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 new file mode 100644 index 0000000000000000000000000000000000000000..5310f486276a186a0fca91a1330e51824963b0e7 GIT binary patch literal 106 zcmV-w0G0oE0V^p=O;s>7He@g~FfcPQQAo?oNoBZXa`Zv?Kci!1uhL(fw)m11d+T)w zlDq+fg^1Oa1^=|Ry$e3{zH{l#M|-E5-a=Af$gp(JAs4j MzzC}q04bP0UJbu9e*gdg literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/filterPath3/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/filterPath3/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/filterPath3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/filterPath3/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 0000000000000000000000000000000000000000..d39fa7d2fecf1c45a132dfe3a8758952f3c8d968 GIT binary patch literal 21 ccmb}lpN08nuUO8@`> literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/filterPath3/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 0000000000000000000000000000000000000000..9b771fc2f6f41f91b00976b4ff3f8f9935f7931e GIT binary patch literal 21 ccmb>`CU&08otwO#lD@ literal 0 HcmV?d00001 diff --git a/test/integration/filterPath3/expected/.git_keep/objects/e9/2eec6edb251fbc68435ffd5cd7a52f886f062d b/test/integration/filterPath3/expected/.git_keep/objects/e9/2eec6edb251fbc68435ffd5cd7a52f886f062d new file mode 100644 index 0000000000000000000000000000000000000000..c61ff33125198cd9898b91cef54776cd889534e3 GIT binary patch literal 118 zcmV-+0Ez#20gcT;3c@fDKvCB@#q0%{iQ^;#B0^U^M$$~M&=4sRJia}G+s}i)^w!n^ z#C#gN8IWB~LRQt1=@ujvGQ*fFSM<45ug1#kUHXhy-(i~JKFv@2ruN?Kvh?-<5(*+w YqrjOE(H-@e4EvM2x^9N<2jH 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 test3 > file1 +echo test4 > file2 +git add . +git commit -am "file1 and file2" + +echo test4 > file +git add . +git commit -am "file" diff --git a/test/integration/filterPath3/test.json b/test/integration/filterPath3/test.json new file mode 100644 index 000000000..682ac9c2f --- /dev/null +++ b/test/integration/filterPath3/test.json @@ -0,0 +1 @@ +{ "description": "Open filter path mode from within lazygit", "speed": 10 }