Skip to content

Commit

Permalink
Auto merge of #7083 - sekhat:issue/7003-allow-dirty, r=alexcrichton
Browse files Browse the repository at this point in the history
improve uncommitted changes cargo-package message

fixes #7003

Explicitly state what the suggested flag `--allow-dirty`
actually does when packaging/publishing the crate. Primarily,
that the uncommitted changes are included within the resulting
package.
  • Loading branch information
bors committed Jul 1, 2019
2 parents 143aaed + 69226ed commit 092b8f2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ fn check_repo_state(
failure::bail!(
"{} files in the working directory contain changes that were \
not yet committed into git:\n\n{}\n\n\
to proceed despite this, pass the `--allow-dirty` flag",
to proceed despite this and include the uncommited changes, pass the `--allow-dirty` flag",
dirty.len(),
dirty.join("\n")
)
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ committed into git:
Cargo.toml
to proceed despite this, pass the `--allow-dirty` flag
to proceed despite this and include the uncommited changes, pass the `--allow-dirty` flag
",
)
.run();
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/publish.rs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ committed into git:
bar
to proceed despite this, pass the `--allow-dirty` flag
to proceed despite this and include the uncommited changes, pass the `--allow-dirty` flag
",
)
.run();
Expand Down

0 comments on commit 092b8f2

Please sign in to comment.