summaryrefslogtreecommitdiff
path: root/color.c
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2019-08-13 20:02:44 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-13 13:10:09 -0700
commit507e5470a0e8be7e2a50a5ffe1f690d06dc00056 (patch)
treecb64a078c739605a596ccbcc022039dedef0720b /color.c
parentSync with Git 2.22.1 (diff)
downloadtgif-507e5470a0e8be7e2a50a5ffe1f690d06dc00056.tar.xz
worktree remove: clarify error message on dirty worktree
To avoid data loss, 'git worktree remove' refuses to delete a worktree if it's dirty or contains untracked files. However, the error message only mentions that the worktree "is dirty", even if the worktree in question is in fact clean, but contains untracked files: $ git worktree add test-worktree Preparing worktree (new branch 'test-worktree') HEAD is now at aa53e60 Initial $ >test-worktree/untracked-file $ git worktree remove test-worktree/ fatal: 'test-worktree/' is dirty, use --force to delete it $ git -C test-worktree/ diff $ git -C test-worktree/ diff --cached $ # Huh? Where are those dirty files?! Clarify this error message to say that the worktree "contains modified or untracked files". Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'color.c')
0 files changed, 0 insertions, 0 deletions