kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sg/worktree-remove-errormsg' 

Error message update/clarification.

* sg/worktree-remove-errormsg:
  worktree remove: clarify error message on dirty worktree
maint
Junio C Hamano 2019-08-22 12:34:12 -07:00
parent 22e86e85cb 507e5470a0
commit d4b12b9e07
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/worktree.c
View File

@ -880,7 +880,7 @@ static void check_clean_worktree(struct worktree *wt,
original_path); original_path);
ret = xread(cp.out, buf, sizeof(buf)); ret = xread(cp.out, buf, sizeof(buf));
if (ret) 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); original_path);
close(cp.out); close(cp.out);
ret = finish_command(&cp); ret = finish_command(&cp);