diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-05-13 17:49:44 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-15 14:17:18 +0900 |
commit | 105df73e71a9eb901d7ca96f12ce3645729ae486 (patch) | |
tree | d29c7f1b342b5fe01913f40600af74d772a21b12 /contrib/completion/git-prompt.sh | |
parent | mingw: allow building with an MSYS2 runtime v3.x (diff) | |
download | tgif-105df73e71a9eb901d7ca96f12ce3645729ae486.tar.xz |
worktree add: be tolerant of corrupt worktrees
find_worktree() can die() unexpectedly because it uses real_path()
instead of the gentler version. When it's used in 'git worktree add' [1]
and there's a bad worktree, this die() could prevent people from adding
new worktrees.
The "bad" condition to trigger this is when a parent of the worktree's
location is deleted. Then real_path() will complain.
Use the other version so that bad worktrees won't affect 'worktree
add'. The bad ones will eventually be pruned, we just have to tolerate
them for a bit.
[1] added in cb56f55c16 (worktree: disallow adding same path multiple
times, 2018-08-28), or since v2.20.0. Though the real bug in
find_worktree() is much older.
Reported-by: Shaheed Haque <shaheedhaque@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion/git-prompt.sh')
0 files changed, 0 insertions, 0 deletions