diff --git a/test/integration/filterPath2/expected/.git_keep/COMMIT_EDITMSG b/test/integration/filterPath2/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +test diff --git a/test/integration/filterPath2/expected/.git_keep/FETCH_HEAD b/test/integration/filterPath2/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/filterPath2/expected/.git_keep/HEAD b/test/integration/filterPath2/expected/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/filterPath2/expected/.git_keep/config b/test/integration/filterPath2/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/filterPath2/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/filterPath2/expected/.git_keep/description b/test/integration/filterPath2/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/filterPath2/expected/.git_keep/index b/test/integration/filterPath2/expected/.git_keep/index new file mode 100644 index 000000000..9af85a58c Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/index differ diff --git a/test/integration/filterPath2/expected/.git_keep/info/exclude b/test/integration/filterPath2/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/filterPath2/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/filterPath2/expected/.git_keep/logs/HEAD b/test/integration/filterPath2/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..86d311d47 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 36d991b179958e18281131be9914649ebe40bfba CI 1617668883 +1000 commit (initial): file0 +36d991b179958e18281131be9914649ebe40bfba 7d3e3bcc43446179c3fe38dec8cfccb87514c3fa CI 1617668883 +1000 commit: file1 +7d3e3bcc43446179c3fe38dec8cfccb87514c3fa f6707836a7d9a861ebfeff921a45ed43cd429cef CI 1617668883 +1000 commit: file2 +f6707836a7d9a861ebfeff921a45ed43cd429cef 914d8fff27717808920192dc44535c711f41dc75 CI 1617668883 +1000 commit: file1 and file2 +914d8fff27717808920192dc44535c711f41dc75 23b4388df8cdc033c4266f55a4234c41f2e6a857 CI 1617668883 +1000 commit: file +23b4388df8cdc033c4266f55a4234c41f2e6a857 c1a2676f74b3007ebb101d4d121cecb4850f1378 CI 1617668905 +1000 commit: test diff --git a/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master b/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..86d311d47 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 36d991b179958e18281131be9914649ebe40bfba CI 1617668883 +1000 commit (initial): file0 +36d991b179958e18281131be9914649ebe40bfba 7d3e3bcc43446179c3fe38dec8cfccb87514c3fa CI 1617668883 +1000 commit: file1 +7d3e3bcc43446179c3fe38dec8cfccb87514c3fa f6707836a7d9a861ebfeff921a45ed43cd429cef CI 1617668883 +1000 commit: file2 +f6707836a7d9a861ebfeff921a45ed43cd429cef 914d8fff27717808920192dc44535c711f41dc75 CI 1617668883 +1000 commit: file1 and file2 +914d8fff27717808920192dc44535c711f41dc75 23b4388df8cdc033c4266f55a4234c41f2e6a857 CI 1617668883 +1000 commit: file +23b4388df8cdc033c4266f55a4234c41f2e6a857 c1a2676f74b3007ebb101d4d121cecb4850f1378 CI 1617668905 +1000 commit: test diff --git a/test/integration/filterPath2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/filterPath2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 new file mode 100644 index 000000000..f74bf2335 Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/filterPath2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 new file mode 100644 index 000000000..79fcadf67 Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 b/test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 new file mode 100644 index 000000000..96fc3d97b Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/23/b4388df8cdc033c4266f55a4234c41f2e6a857 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba b/test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba new file mode 100644 index 000000000..012d9528a Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/36/d991b179958e18281131be9914649ebe40bfba differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/filterPath2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da new file mode 100644 index 000000000..06c9cb73d Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 b/test/integration/filterPath2/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 new file mode 100644 index 000000000..ad968bd2f Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa b/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa new file mode 100644 index 000000000..aaaac7f83 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa @@ -0,0 +1,2 @@ +xA + @Ѯ=BqԌR*q؄`ǯG֮쥟"l(qJ8C'у:)"(mpeHxkN*}k?<ڱɍЀcN_FS]䪮d9O \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 b/test/integration/filterPath2/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 new file mode 100644 index 000000000..e51e74d64 Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 b/test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 new file mode 100644 index 000000000..6aad40784 Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/91/4d8fff27717808920192dc44535c711f41dc75 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/filterPath2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c new file mode 100644 index 000000000..0e95eb06d Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/filterPath2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 new file mode 100644 index 000000000..285df3e5f Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/c1/a2676f74b3007ebb101d4d121cecb4850f1378 b/test/integration/filterPath2/expected/.git_keep/objects/c1/a2676f74b3007ebb101d4d121cecb4850f1378 new file mode 100644 index 000000000..44fc42ade Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/c1/a2676f74b3007ebb101d4d121cecb4850f1378 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 b/test/integration/filterPath2/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 new file mode 100644 index 000000000..5310f4862 Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/filterPath2/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 new file mode 100644 index 000000000..2e9066287 --- /dev/null +++ b/test/integration/filterPath2/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/filterPath2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/filterPath2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 new file mode 100644 index 000000000..d39fa7d2f Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/filterPath2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b new file mode 100644 index 000000000..9b771fc2f Binary files /dev/null and b/test/integration/filterPath2/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b differ diff --git a/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef b/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef new file mode 100644 index 000000000..def7bfe3a --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef @@ -0,0 +1,2 @@ +xA +0a9$i2#`Dn?Z8K;UaT0 9RdDD/w$^;p!DL#D0/ ݲɟOfOSx><\ZkSMMY7u'p: \ No newline at end of file diff --git a/test/integration/filterPath2/expected/.git_keep/refs/heads/master b/test/integration/filterPath2/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..4c86c3b07 --- /dev/null +++ b/test/integration/filterPath2/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +c1a2676f74b3007ebb101d4d121cecb4850f1378 diff --git a/test/integration/filterPath2/expected/file b/test/integration/filterPath2/expected/file new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/filterPath2/expected/file @@ -0,0 +1 @@ +test4 diff --git a/test/integration/filterPath2/expected/file0 b/test/integration/filterPath2/expected/file0 new file mode 100644 index 000000000..38143ad4a --- /dev/null +++ b/test/integration/filterPath2/expected/file0 @@ -0,0 +1 @@ +test0 diff --git a/test/integration/filterPath2/expected/file1 b/test/integration/filterPath2/expected/file1 new file mode 100644 index 000000000..a5bce3fd2 --- /dev/null +++ b/test/integration/filterPath2/expected/file1 @@ -0,0 +1 @@ +test1 diff --git a/test/integration/filterPath2/expected/file2 b/test/integration/filterPath2/expected/file2 new file mode 100644 index 000000000..d234c5e05 --- /dev/null +++ b/test/integration/filterPath2/expected/file2 @@ -0,0 +1 @@ +test4 diff --git a/test/integration/filterPath2/recording.json b/test/integration/filterPath2/recording.json new file mode 100644 index 000000000..b857e533e --- /dev/null +++ b/test/integration/filterPath2/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":650,"Mod":0,"Key":259,"Ch":0},{"Timestamp":970,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1547,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2370,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3506,"Mod":0,"Key":256,"Ch":120},{"Timestamp":4658,"Mod":0,"Key":256,"Ch":47},{"Timestamp":4971,"Mod":0,"Key":256,"Ch":102},{"Timestamp":5066,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5106,"Mod":0,"Key":256,"Ch":108},{"Timestamp":5178,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5266,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5338,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5426,"Mod":0,"Key":256,"Ch":45},{"Timestamp":5674,"Mod":0,"Key":256,"Ch":98},{"Timestamp":5698,"Mod":0,"Key":256,"Ch":121},{"Timestamp":5938,"Mod":0,"Key":256,"Ch":45},{"Timestamp":6148,"Mod":0,"Key":256,"Ch":112},{"Timestamp":6291,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6330,"Mod":0,"Key":256,"Ch":116},{"Timestamp":6394,"Mod":0,"Key":256,"Ch":104},{"Timestamp":6666,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8498,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10194,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12275,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13378,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14442,"Mod":2,"Key":16,"Ch":16},{"Timestamp":15442,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15706,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16058,"Mod":0,"Key":13,"Ch":13},{"Timestamp":17286,"Mod":0,"Key":27,"Ch":0},{"Timestamp":17992,"Mod":0,"Key":27,"Ch":0},{"Timestamp":18625,"Mod":0,"Key":27,"Ch":0},{"Timestamp":19883,"Mod":0,"Key":260,"Ch":0},{"Timestamp":20210,"Mod":0,"Key":260,"Ch":0},{"Timestamp":20987,"Mod":0,"Key":256,"Ch":99},{"Timestamp":21386,"Mod":0,"Key":256,"Ch":116},{"Timestamp":21514,"Mod":0,"Key":256,"Ch":101},{"Timestamp":21722,"Mod":0,"Key":256,"Ch":115},{"Timestamp":21770,"Mod":0,"Key":256,"Ch":116},{"Timestamp":22338,"Mod":0,"Key":13,"Ch":13},{"Timestamp":23658,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/filterPath2/setup.sh b/test/integration/filterPath2/setup.sh new file mode 100644 index 000000000..e766b6bdb --- /dev/null +++ b/test/integration/filterPath2/setup.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +# need a history of commits each containing various files + +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 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/filterPath2/test.json b/test/integration/filterPath2/test.json new file mode 100644 index 000000000..682ac9c2f --- /dev/null +++ b/test/integration/filterPath2/test.json @@ -0,0 +1 @@ +{ "description": "Open filter path mode from within lazygit", "speed": 10 }