Skip to content

Commit

Permalink
cli: Fix error message grammar and associated tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanaelhuffman authored and thoughtpolice committed Nov 26, 2024
1 parent ea72a4a commit f6210aa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cli/src/command_error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ impl From<SnapshotError> for CommandError {
err_str,
))
.hinted(format!(
"This is to prevent large files from being added on accident. You can fix \
"This is to prevent large files from being added by accident. You can fix \
this error by:
- Adding the file to `.gitignore`
- Run `jj config set --repo snapshot.max-new-file-size {}`
Expand Down
4 changes: 2 additions & 2 deletions cli/tests/test_working_copy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fn test_snapshot_large_file() {
insta::assert_snapshot!(stderr, @r###"
Error: Failed to snapshot the working copy
The file '$TEST_ENV/repo/large' is too large to be snapshotted: it is 3 bytes too large; the maximum size allowed is 10 bytes (10.0B).
Hint: This is to prevent large files from being added on accident. You can fix this error by:
Hint: This is to prevent large files from being added by accident. You can fix this error by:
- Adding the file to `.gitignore`
- Run `jj config set --repo snapshot.max-new-file-size 13`
This will increase the maximum file size allowed for new files, in this repository only.
Expand All @@ -46,7 +46,7 @@ fn test_snapshot_large_file() {
insta::assert_snapshot!(stderr, @r###"
Error: Failed to snapshot the working copy
The file '$TEST_ENV/repo/large' is too large to be snapshotted: it is 1024 bytes too large; the maximum size allowed is 10240 bytes (10.0KiB).
Hint: This is to prevent large files from being added on accident. You can fix this error by:
Hint: This is to prevent large files from being added by accident. You can fix this error by:
- Adding the file to `.gitignore`
- Run `jj config set --repo snapshot.max-new-file-size 11264`
This will increase the maximum file size allowed for new files, in this repository only.
Expand Down

0 comments on commit f6210aa

Please sign in to comment.