diff --git a/go.mod b/go.mod index c3e47a4..78a1782 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.22.1 require ( - github.com/codecrafters-io/tester-utils v0.2.24 + github.com/codecrafters-io/tester-utils v0.2.25 github.com/go-git/go-billy/v5 v5.0.0 github.com/go-git/go-git/v5 v5.0.0 ) @@ -30,7 +30,7 @@ require ( github.com/xanzy/ssh-agent v0.2.1 // indirect golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 // indirect golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.21.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 295e111..82a8dd5 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/codecrafters-io/tester-utils v0.2.24 h1:8IwKd70n9BMfVqNoGxRJItFj769p6h6LxCx4OMwWoq8= -github.com/codecrafters-io/tester-utils v0.2.24/go.mod h1:VgP0WmmRsA8L1urWGMXPW4Zv5jcwHwR0LdKZ8ZAEFT4= +github.com/codecrafters-io/tester-utils v0.2.25 h1:LifnY7J24MZ/hUtaEL9BjSYyKs1vve5IsGkRYM7OUKc= +github.com/codecrafters-io/tester-utils v0.2.25/go.mod h1:VgP0WmmRsA8L1urWGMXPW4Zv5jcwHwR0LdKZ8ZAEFT4= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -73,8 +73,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/internal/test_helpers/fixtures/create_blob_failure b/internal/test_helpers/fixtures/create_blob_failure index 1dd9521..85e3faa 100644 --- a/internal/test_helpers/fixtures/create_blob_failure +++ b/internal/test_helpers/fixtures/create_blob_failure @@ -10,12 +10,12 @@ Debug = true [stage-3] Git object file doesn't match official Git implementation. Diff after zlib decompression: [stage-3]  [stage-3] Expected (bytes 0-52), hexadecimal: | ASCII: -[stage-3] 62 6c 6f 62 20 34 34 00 6f 72 61 6e 67 65 20 70 65 61 72 20 | blob 44.orange pear +[stage-3] 62 6c 6f 62 20 34 34 00 6f 72 61 6e 67 65 20 70 65 61 72 20 | blob 44.orange pear [stage-3] 67 72 61 70 65 20 70 69 6e 65 61 70 70 6c 65 20 62 6c 75 65 | grape pineapple blue [stage-3] 62 65 72 72 79 20 62 61 6e 61 6e 61 | berry banana [stage-3]  [stage-3] Actual (bytes 0-52), hexadecimal: | ASCII: -[stage-3] 62 6c 6f 62 34 34 00 6f 72 61 6e 67 65 20 70 65 61 72 20 67 | blob44.orange pear g +[stage-3] 62 6c 6f 62 34 34 00 6f 72 61 6e 67 65 20 70 65 61 72 20 67 | blob44.orange pear g [stage-3] 72 61 70 65 20 70 69 6e 65 61 70 70 6c 65 20 62 6c 75 65 62 | rape pineapple blueb [stage-3] 65 72 72 79 20 62 61 6e 61 6e 61 | erry banana [stage-3]  diff --git a/internal/test_helpers/fixtures/write_tree_fail b/internal/test_helpers/fixtures/write_tree_fail index a9ecba9..14bd335 100644 --- a/internal/test_helpers/fixtures/write_tree_fail +++ b/internal/test_helpers/fixtures/write_tree_fail @@ -11,14 +11,14 @@ Debug = true [stage-5] Git object file doesn't match official Git implementation. Diff after zlib decompression: [stage-5]  [stage-5] Expected (bytes 0-100), hexadecimal: | ASCII: -[stage-5] 74 72 65 65 20 31 30 30 00 31 30 30 36 34 34 20 68 6f 72 73 | tree 100.100644 hors +[stage-5] 74 72 65 65 20 31 30 30 00 31 30 30 36 34 34 20 68 6f 72 73 | tree 100.100644 hors [stage-5] 65 79 00 b3 bb b4 97 51 ee 2c 31 b7 c5 e1 24 06 5d 0f 38 1b | ey.....Q.,1...$.].8. [stage-5] fe 7a ff 34 30 30 30 30 20 68 75 6d 70 74 79 00 39 b2 e8 c1 | .z.40000 humpty.9... [stage-5] 14 4b ba dd 5e a5 a0 d0 85 9c 16 7b 6b fc 73 08 34 30 30 30 | .K..^......{k.s.4000 [stage-5] 30 20 6d 6f 6e 6b 65 79 00 a1 e1 d3 c8 39 8b 89 b3 09 92 17 | 0 monkey.....9...... [stage-5]  [stage-5] Actual (bytes 0-100), hexadecimal: | ASCII: -[stage-5] 74 72 65 65 20 31 30 32 00 31 30 30 36 34 34 20 68 6f 72 73 | tree 102.100644 hors +[stage-5] 74 72 65 65 20 31 30 32 00 31 30 30 36 34 34 20 68 6f 72 73 | tree 102.100644 hors [stage-5] 65 79 00 b3 bb b4 97 51 ee 2c 31 b7 c5 e1 24 06 5d 0f 38 1b | ey.....Q.,1...$.].8. [stage-5] fe 7a ff 30 34 30 30 30 30 20 68 75 6d 70 74 79 00 39 b2 e8 | .z.040000 humpty.9.. [stage-5] c1 14 4b ba dd 5e a5 a0 d0 85 9c 16 7b 6b fc 73 08 30 34 30 | ..K..^......{k.s.040