The documentation describes require_work_tree as guarding against
bare repositories, and that's also the way it's used from porcelain
such as git-rebase. When implemented using --is-inside-work-tree
the samantics change, causing git-rebase to fail if run from outside
GIT_WORK_TREE, even if GIT_WORK_TREE is valid.
Signed-off-by: Tor Arne Vestbø <tor.arne.vestbo@xxxxxxxxx>
---
git-sh-setup.sh | 2 +-
t/t1501-worktree.sh | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 6131670..f8e4428 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -141,7 +141,7 @@ cd_to_toplevel () {
}
require_work_tree () {
- test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
+ test -n "$(git rev-parse --show-toplevel 2>/dev/null)" ||
die "fatal: $0 cannot be used without a working tree."
}
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index bd8b607..45b09e7 100755
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -114,6 +114,15 @@ test_expect_success 'repo finds its work tree from work tree, too' '
test sub/dir/tracked = "$(git ls-files)")
'
+test_expect_success 'require_work_tree finds work tree' '
+ (cd repo.git/work &&
+ . "$(git --exec-path)"/git-sh-setup &&
+ cd .. &&
+ require_work_tree &&
+ cd .. &&
+ require_work_tree)
+'
+
test_expect_success '_gently() groks relative GIT_DIR & GIT_WORK_TREE' '
(cd repo.git/work/sub/dir &&
GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \
--
1.7.2.19.g48995
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html