diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/excludeGitIgnore/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..5852f4463 --- /dev/null +++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +Initial commit diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/config b/test/integration/excludeGitIgnore/expected/repo/.git_keep/config index 6c9406b7d..8ae104545 100644 --- a/test/integration/excludeGitIgnore/expected/repo/.git_keep/config +++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/config @@ -5,3 +5,6 @@ logallrefupdates = true ignorecase = true precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/index b/test/integration/excludeGitIgnore/expected/repo/.git_keep/index new file mode 100644 index 000000000..65d675154 Binary files /dev/null and b/test/integration/excludeGitIgnore/expected/repo/.git_keep/index differ diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/info/exclude b/test/integration/excludeGitIgnore/expected/repo/.git_keep/info/exclude index a5196d1be..8e9f2071f 100644 --- a/test/integration/excludeGitIgnore/expected/repo/.git_keep/info/exclude +++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/info/exclude @@ -4,3 +4,4 @@ # exclude patterns (uncomment them if you want to use them): # *.[oa] # *~ +.DS_Store diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/logs/HEAD b/test/integration/excludeGitIgnore/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..bad114b22 --- /dev/null +++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 e976bc07c8784964cf239ac9fbdc3535df55269c CI 1657012812 +1000 commit (initial): Initial commit diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/excludeGitIgnore/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..bad114b22 --- /dev/null +++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 e976bc07c8784964cf239ac9fbdc3535df55269c CI 1657012812 +1000 commit (initial): Initial commit diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/excludeGitIgnore/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 000000000..adf64119a Binary files /dev/null and b/test/integration/excludeGitIgnore/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/objects/e9/76bc07c8784964cf239ac9fbdc3535df55269c b/test/integration/excludeGitIgnore/expected/repo/.git_keep/objects/e9/76bc07c8784964cf239ac9fbdc3535df55269c new file mode 100644 index 000000000..9803ebd13 Binary files /dev/null and b/test/integration/excludeGitIgnore/expected/repo/.git_keep/objects/e9/76bc07c8784964cf239ac9fbdc3535df55269c differ diff --git a/test/integration/excludeGitIgnore/expected/repo/.git_keep/refs/heads/master b/test/integration/excludeGitIgnore/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..364cd7031 --- /dev/null +++ b/test/integration/excludeGitIgnore/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +e976bc07c8784964cf239ac9fbdc3535df55269c diff --git a/test/integration/excludeGitIgnore/recording.json b/test/integration/excludeGitIgnore/recording.json index c6decb156..9c332fe93 100644 --- a/test/integration/excludeGitIgnore/recording.json +++ b/test/integration/excludeGitIgnore/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":2674,"Mod":0,"Key":256,"Ch":105},{"Timestamp":4846,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8064,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8515,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":170,"Height":55}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":642,"Mod":0,"Key":256,"Ch":105},{"Timestamp":1529,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2522,"Mod":0,"Key":27,"Ch":0},{"Timestamp":2962,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":238,"Height":61}]} \ No newline at end of file diff --git a/test/integration/excludeGitIgnore/setup.sh b/test/integration/excludeGitIgnore/setup.sh index b637ff2a8..f0c6f3c8f 100644 --- a/test/integration/excludeGitIgnore/setup.sh +++ b/test/integration/excludeGitIgnore/setup.sh @@ -9,5 +9,7 @@ git init git config user.email "CI@example.com" git config user.name "CI" +git commit --allow-empty -m "Initial commit" + echo test1 > .gitignore diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/excludeMenu/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..5852f4463 --- /dev/null +++ b/test/integration/excludeMenu/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +Initial commit diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/config b/test/integration/excludeMenu/expected/repo/.git_keep/config index 6c9406b7d..8ae104545 100644 --- a/test/integration/excludeMenu/expected/repo/.git_keep/config +++ b/test/integration/excludeMenu/expected/repo/.git_keep/config @@ -5,3 +5,6 @@ logallrefupdates = true ignorecase = true precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/index b/test/integration/excludeMenu/expected/repo/.git_keep/index new file mode 100644 index 000000000..65d675154 Binary files /dev/null and b/test/integration/excludeMenu/expected/repo/.git_keep/index differ diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/info/lg_exclude_file b/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude similarity index 96% rename from test/integration/excludeMenu/expected/repo/.git_keep/info/lg_exclude_file rename to test/integration/excludeMenu/expected/repo/.git_keep/info/exclude index ee02e5c09..f5a9a36c0 100644 --- a/test/integration/excludeMenu/expected/repo/.git_keep/info/lg_exclude_file +++ b/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude @@ -4,5 +4,6 @@ # exclude patterns (uncomment them if you want to use them): # *.[oa] # *~ +.DS_Store myfile1 \ No newline at end of file diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/logs/HEAD b/test/integration/excludeMenu/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..d4002669d --- /dev/null +++ b/test/integration/excludeMenu/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 129cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 CI 1657012793 +1000 commit (initial): Initial commit diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/excludeMenu/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..d4002669d --- /dev/null +++ b/test/integration/excludeMenu/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 129cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 CI 1657012793 +1000 commit (initial): Initial commit diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/objects/12/9cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 b/test/integration/excludeMenu/expected/repo/.git_keep/objects/12/9cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 new file mode 100644 index 000000000..ffa5ec652 Binary files /dev/null and b/test/integration/excludeMenu/expected/repo/.git_keep/objects/12/9cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 differ diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/excludeMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 000000000..adf64119a Binary files /dev/null and b/test/integration/excludeMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/refs/heads/master b/test/integration/excludeMenu/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..d255339cd --- /dev/null +++ b/test/integration/excludeMenu/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +129cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 diff --git a/test/integration/excludeMenu/recording.json b/test/integration/excludeMenu/recording.json index 1efef59a6..d45736788 100644 --- a/test/integration/excludeMenu/recording.json +++ b/test/integration/excludeMenu/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":1418,"Mod":0,"Key":256,"Ch":105},{"Timestamp":1725,"Mod":0,"Key":256,"Ch":101},{"Timestamp":3207,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":170,"Height":55}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":788,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2342,"Mod":0,"Key":256,"Ch":101},{"Timestamp":3429,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":238,"Height":61}]} \ No newline at end of file diff --git a/test/integration/excludeMenu/setup.sh b/test/integration/excludeMenu/setup.sh index ae599ff5f..bd74671ea 100644 --- a/test/integration/excludeMenu/setup.sh +++ b/test/integration/excludeMenu/setup.sh @@ -9,5 +9,7 @@ git init git config user.email "CI@example.com" git config user.name "CI" +git commit --allow-empty -m "Initial commit" + echo test1 > myfile1 diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/gitignoreMenu/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..5852f4463 --- /dev/null +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +Initial commit diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/config b/test/integration/gitignoreMenu/expected/repo/.git_keep/config index 6c9406b7d..8ae104545 100644 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/config +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/config @@ -5,3 +5,6 @@ logallrefupdates = true ignorecase = true precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/index b/test/integration/gitignoreMenu/expected/repo/.git_keep/index new file mode 100644 index 000000000..65d675154 Binary files /dev/null and b/test/integration/gitignoreMenu/expected/repo/.git_keep/index differ diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude b/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude index a5196d1be..8e9f2071f 100644 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude @@ -4,3 +4,4 @@ # exclude patterns (uncomment them if you want to use them): # *.[oa] # *~ +.DS_Store diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/HEAD b/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..bef74759d --- /dev/null +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9dd04ee245b7d6f1f80aa2b428111cbac4a4e37d CI 1657012500 +1000 commit (initial): Initial commit diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..bef74759d --- /dev/null +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9dd04ee245b7d6f1f80aa2b428111cbac4a4e37d CI 1657012500 +1000 commit (initial): Initial commit diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 000000000..adf64119a Binary files /dev/null and b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/9d/d04ee245b7d6f1f80aa2b428111cbac4a4e37d b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/9d/d04ee245b7d6f1f80aa2b428111cbac4a4e37d new file mode 100644 index 000000000..eb76d5d88 Binary files /dev/null and b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/9d/d04ee245b7d6f1f80aa2b428111cbac4a4e37d differ diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/refs/heads/master b/test/integration/gitignoreMenu/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..998d07e0e --- /dev/null +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +9dd04ee245b7d6f1f80aa2b428111cbac4a4e37d diff --git a/test/integration/gitignoreMenu/recording.json b/test/integration/gitignoreMenu/recording.json index 7b2531e84..c1078e842 100644 --- a/test/integration/gitignoreMenu/recording.json +++ b/test/integration/gitignoreMenu/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":3418,"Mod":0,"Key":256,"Ch":105},{"Timestamp":3721,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5154,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":170,"Height":55}]} \ No newline at end of file +{"KeyEvents":[{"Timestamp":1133,"Mod":0,"Key":256,"Ch":105},{"Timestamp":1927,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2735,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":238,"Height":61}]} \ No newline at end of file diff --git a/test/integration/gitignoreMenu/setup.sh b/test/integration/gitignoreMenu/setup.sh index 163ed456d..2fb4f86bc 100644 --- a/test/integration/gitignoreMenu/setup.sh +++ b/test/integration/gitignoreMenu/setup.sh @@ -9,4 +9,6 @@ git init git config user.email "CI@example.com" git config user.name "CI" +git commit --allow-empty -m "Initial commit" + echo test1 > myfile1