diff options
| author | Luka Markušić <luka.markusic@microblink.com> | 2022-08-03 07:51:13 +0200 |
|---|---|---|
| committer | Luka Markušić <luka.markusic@microblink.com> | 2022-08-03 07:55:51 +0200 |
| commit | d56bb0b8ef0d9f3289e6e47288d79ed4d84088b0 (patch) | |
| tree | 0912c18e40143eaf37b68b01ddd6623bf292be8f | |
| parent | d238d8952ba5e64d15f4cfbb4295aa76da38e835 (diff) | |
Fix the integration test
9 files changed, 9 insertions, 10 deletions
diff --git a/pkg/commands/oscommands/os.go b/pkg/commands/oscommands/os.go index 3a42d09db..5f89f976f 100644 --- a/pkg/commands/oscommands/os.go +++ b/pkg/commands/oscommands/os.go @@ -120,10 +120,12 @@ func (c *OSCommand) AppendLineToFile(filename, line string) error { return utils.WrapError(err) } - // read last char buf := make([]byte, 1) - if _, err := f.ReadAt(buf, info.Size()-1); err != nil { - return utils.WrapError(err) + if info.Size() > 0 { + // read last char + if _, err := f.ReadAt(buf, info.Size()-1); err != nil { + return utils.WrapError(err) + } } // if the last byte of the file is not a newline, add it 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..698da4260 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 022c2391c4f9e4a963e1c35a087f08772a4ea0f0 CI <CI@example.com> 1659505392 +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..698da4260 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 022c2391c4f9e4a963e1c35a087f08772a4ea0f0 CI <CI@example.com> 1659505392 +0200 commit (initial): Initial commit diff --git a/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/02/2c2391c4f9e4a963e1c35a087f08772a4ea0f0 b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/02/2c2391c4f9e4a963e1c35a087f08772a4ea0f0 Binary files differnew file mode 100644 index 000000000..965507617 --- /dev/null +++ b/test/integration/gitignoreMenu/expected/repo/.git_keep/objects/02/2c2391c4f9e4a963e1c35a087f08772a4ea0f0 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..c365b8ee5 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 +022c2391c4f9e4a963e1c35a087f08772a4ea0f0 diff --git a/test/integration/gitignoreMenu/expected/repo/lg_ignore_file b/test/integration/gitignoreMenu/expected/repo/lg_ignore_file index 959aad479..aa938c6ee 100644 --- a/test/integration/gitignoreMenu/expected/repo/lg_ignore_file +++ b/test/integration/gitignoreMenu/expected/repo/lg_ignore_file @@ -1,2 +1,2 @@ -myfile1
\ No newline at end of file +myfile1 |