Skip to content

Commit 092b8f2

Browse files
committed
Auto merge of #7083 - sekhat:issue/7003-allow-dirty, r=alexcrichton
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.
2 parents 143aaed + 69226ed commit 092b8f2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/cargo/ops/cargo_package.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ fn check_repo_state(
291291
failure::bail!(
292292
"{} files in the working directory contain changes that were \
293293
not yet committed into git:\n\n{}\n\n\
294-
to proceed despite this, pass the `--allow-dirty` flag",
294+
to proceed despite this and include the uncommited changes, pass the `--allow-dirty` flag",
295295
dirty.len(),
296296
dirty.join("\n")
297297
)

tests/testsuite/package.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ committed into git:
758758
759759
Cargo.toml
760760
761-
to proceed despite this, pass the `--allow-dirty` flag
761+
to proceed despite this and include the uncommited changes, pass the `--allow-dirty` flag
762762
",
763763
)
764764
.run();

tests/testsuite/publish.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ committed into git:
396396
397397
bar
398398
399-
to proceed despite this, pass the `--allow-dirty` flag
399+
to proceed despite this and include the uncommited changes, pass the `--allow-dirty` flag
400400
",
401401
)
402402
.run();

0 commit comments

Comments
 (0)