From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Feb 2016 22:20:05 +0000 (-0800)
Subject: Merge branch 'nd/do-not-move-worktree-manually'
X-Git-Tag: v2.8.0-rc0~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0a1cbccab54d828be2d83acc73f38c162962966;p=git

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
---

d0a1cbccab54d828be2d83acc73f38c162962966