mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-16 00:56:23 +00:00
3e79eacaf7
I was initially worried about the cost of always snapshotting the working copy, so that's why e.g. `jj diff -r <some hash>` doesn't do it. However, there's been a few caused by missing snapshotting, and there are still a few (I just noticed it in `jj undo` while writing this patch). Let's always do the snapshotting and if the user really doesn't want it, they can pass `--no-commit-working-copy` (which we should probably rename to `--no-snapshot-working-copy` or maybe just `--no-snapshot`). That should reduce bugs and make the CLI more predictable. Two test cases were affected becasue `jj merge` also didn't snapshot the working copy. Before this patch, e.g. `jj co --no-commit-working-copy` would error out, but now it will succeed (without touching the working copy, leaving the working copy stale). That may be confusing, but it should be easy to recover from (e.g. by `jj undo`). We can consider adding a check for it later if it seems too confusing (it's probably rarely something the user wanted). |
||
---|---|---|
.. | ||
common | ||
smoke_test.rs | ||
test_alias.rs | ||
test_branch_command.rs | ||
test_checkout.rs | ||
test_concurrent_operations.rs | ||
test_describe_command.rs | ||
test_diff_command.rs | ||
test_edit_command.rs | ||
test_git_clone.rs | ||
test_git_colocated.rs | ||
test_git_push.rs | ||
test_git_remotes.rs | ||
test_gitignores.rs | ||
test_global_opts.rs | ||
test_init_command.rs | ||
test_log_command.rs | ||
test_move_command.rs | ||
test_new.rs | ||
test_obslog_command.rs | ||
test_operations.rs | ||
test_print_command.rs | ||
test_rebase_command.rs | ||
test_restore_command.rs | ||
test_sparse_command.rs | ||
test_split_command.rs | ||
test_squash_command.rs | ||
test_touchup_command.rs | ||
test_undo.rs | ||
test_unsquash_command.rs | ||
test_untrack_command.rs | ||
test_workspaces.rs |