Merge branch 'nd/do-not-move-worktree-manually'
commitd0a1cbccab54d828be2d83acc73f38c162962966
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:05 +0000 (10 14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:05 +0000 (10 14:20 -0800)
tree474f89e894ad4f8d6e47f5e27d1f08e102a4cd9f
parentff4ea6004fb48146330d663d64a71e7774f059f9
parent618244e160cb0777bc8d41055f7de0192b10ea0f
Merge branch 'nd/do-not-move-worktree-manually'

"git worktree" had a broken code that attempted to auto-fix
possible inconsistency that results from end-users moving a
worktree to different places without telling Git (the original
repository needs to maintain backpointers to its worktrees, but
"mv" run by end-users who are not familiar with that fact will
obviously not adjust them), which actually made things worse
when triggered.

* nd/do-not-move-worktree-manually:
  worktree: stop supporting moving worktrees manually
  worktree.c: fix indentation
setup.c