diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-07 12:49:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-07 12:49:39 +1000 |
| commit | b77f3160f1c1e2d9a45c8468ef465b9631f2edf3 (patch) | |
| tree | c093c9ff8ab3862f266437553529415bb4e34aec /test | |
| parent | 92bde6dda4ef2b607e1a686779e9a845d3eff5a9 (diff) | |
| parent | fdf6a9cc2bcbbf718f7c30592076aa758b960cf1 (diff) | |
Merge pull request #2004 from mark2185/fix-add-to-gitignore-newline
Diffstat (limited to 'test')
8 files changed, 4 insertions, 8 deletions
diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/config b/test/integration/gitignoreMenu/expected/repo/.git_keep/config index 8ae104545..596ebaeb3 100644 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/config +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/config @@ -3,8 +3,6 @@ filemode = true bare = false logallrefupdates = true - ignorecase = true - precomposeunicode = true [user] email = CI@example.com name = CI diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude b/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude index 8e9f2071f..a5196d1be 100644 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/info/exclude @@ -4,4 +4,3 @@ # 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 index bef74759d..329f08e98 100644 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/HEAD +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/HEAD @@ -1 +1 @@ -0000000000000000000000000000000000000000 9dd04ee245b7d6f1f80aa2b428111cbac4a4e37d CI <CI@example.com> 1657012500 +1000 commit (initial): Initial commit +0000000000000000000000000000000000000000 04535177acab8a81c84b0b1b44ee3aea76b0e36e CI <CI@example.com> 1659528492 +0200 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 index bef74759d..329f08e98 100644 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 9dd04ee245b7d6f1f80aa2b428111cbac4a4e37d CI <CI@example.com> 1657012500 +1000 commit (initial): Initial commit +0000000000000000000000000000000000000000 04535177acab8a81c84b0b1b44ee3aea76b0e36e CI <CI@example.com> 1659528492 +0200 commit (initial): Initial commit diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/04/535177acab8a81c84b0b1b44ee3aea76b0e36e b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/04/535177acab8a81c84b0b1b44ee3aea76b0e36e Binary files differnew file mode 100644 index 000000000..ff7e7bc39 --- /dev/null +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/04/535177acab8a81c84b0b1b44ee3aea76b0e36e diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/9d/d04ee245b7d6f1f80aa2b428111cbac4a4e37d b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/9d/d04ee245b7d6f1f80aa2b428111cbac4a4e37d Binary files differdeleted file mode 100644 index eb76d5d88..000000000 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/9d/d04ee245b7d6f1f80aa2b428111cbac4a4e37d +++ /dev/null diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/refs/heads/master b/test/integration/gitignoreMenu/expected/repo/.git_keep/refs/heads/master index 998d07e0e..4725f5182 100644 --- a/test/integration/gitignoreMenu/expected/repo/.git_keep/refs/heads/master +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/refs/heads/master @@ -1 +1 @@ -9dd04ee245b7d6f1f80aa2b428111cbac4a4e37d +04535177acab8a81c84b0b1b44ee3aea76b0e36e diff --git a/test/integration/gitignoreMenu/expected/repo/lg_ignore_file b/test/integration/gitignoreMenu/expected/repo/lg_ignore_file index 959aad479..3829ab872 100644 --- a/test/integration/gitignoreMenu/expected/repo/lg_ignore_file +++ b/test/integration/gitignoreMenu/expected/repo/lg_ignore_file @@ -1,2 +1 @@ - -myfile1
\ No newline at end of file +myfile1 |