diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-22 12:34:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-22 12:34:12 -0700 |
| commit | d4b12b9e07eba2e4ec1eff38a4151c9302bd1e2c (patch) | |
| tree | 271f503cb04bf43ae589dcc3182db19a194fc133 | |
| parent | 22e86e85cba1e2697aea46810238ef9b3c7401cf (diff) | |
| parent | 507e5470a0e8be7e2a50a5ffe1f690d06dc00056 (diff) | |
| download | git-d4b12b9e07eba2e4ec1eff38a4151c9302bd1e2c.tar.gz | |
Merge branch 'sg/worktree-remove-errormsg'
Error message update/clarification.
* sg/worktree-remove-errormsg:
worktree remove: clarify error message on dirty worktree
| -rw-r--r-- | builtin/worktree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index a5bb02b207..7f094f8170 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -880,7 +880,7 @@ static void check_clean_worktree(struct worktree *wt, original_path); ret = xread(cp.out, buf, sizeof(buf)); if (ret) - die(_("'%s' is dirty, use --force to delete it"), + die(_("'%s' contains modified or untracked files, use --force to delete it"), original_path); close(cp.out); ret = finish_command(&cp); |