From 69226ed887e7a8e06a43d5de483e3ca808726e12 Mon Sep 17 00:00:00 2001 From: Sekhat Temporus Date: Mon, 1 Jul 2019 18:40:03 +0100 Subject: [PATCH] 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 uncommited changes are included within the resulting package. --- src/cargo/ops/cargo_package.rs | 2 +- tests/testsuite/package.rs | 2 +- tests/testsuite/publish.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs index afb00edd6..c275ceb46 100644 --- a/src/cargo/ops/cargo_package.rs +++ b/src/cargo/ops/cargo_package.rs @@ -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") ) diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index ff92ddb44..affc22add 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -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(); diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs index 35d6baf7c..15a5a9d12 100644 --- a/tests/testsuite/publish.rs +++ b/tests/testsuite/publish.rs @@ -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();