Skip to content

Commit

Permalink
fix: address review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
mgattozzi committed May 9, 2024
1 parent e4e6c23 commit 23f2ac8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion cli/src/commands/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub struct GitPushArgs {
/// correspond to missing local branches.
#[arg(long)]
deleted: bool,
/// Push branches that contain empty descriptions
/// Push branches with commits that contain empty descriptions
#[arg(long)]
allow_empty_description: bool,
/// Push branches pointing to these commits (can be repeated)
Expand Down
3 changes: 2 additions & 1 deletion cli/tests/[email protected]
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: cli/tests/test_generate_md_cli_help.rs
description: "AUTO-GENERATED FILE, DO NOT EDIT. This cli reference is generated as an `insta` snapshot. MkDocs follows they symlink from docs/cli-reference.md to the snap. Unfortunately, `insta` unavoidably creates this header. Luckily, MkDocs ignores the header since it has the same format as Markdown headers. TODO: MkDocs may fail on Windows if symlinks are not enabled in the OS settings"
---
<!-- BEGIN MARKDOWN-->

Expand Down Expand Up @@ -930,7 +931,7 @@ By default, pushes any branches pointing to `remote_branches(remote=<remote>)..@
Possible values: `true`, `false`
* `--allow-empty-description` — Push branches that contain empty descriptions
* `--allow-empty-description` — Push branches with commits that contain empty descriptions
Possible values: `true`, `false`
Expand Down
7 changes: 0 additions & 7 deletions cli/tests/test_git_push.rs
Original file line number Diff line number Diff line change
Expand Up @@ -642,13 +642,6 @@ fn test_git_push_no_description() {
insta::assert_snapshot!(stderr, @r###"
Error: Won't push commit 5b36783cd11c since it has no description
"###);
}

#[test]
fn test_git_allow_push_no_description() {
let (test_env, workspace_root) = set_up();
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "my-branch"]);
test_env.jj_cmd_ok(&workspace_root, &["describe", "-m="]);
test_env.jj_cmd_ok(
&workspace_root,
&[
Expand Down

0 comments on commit 23f2ac8

Please sign in to comment.