summaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorMatthias Lederhofer <matled@gmx.net>2007-06-03 14:48:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-06 23:07:53 (GMT)
commit7ae3df8c0aa3b7337ae9ac7b6184ac05985bf996 (patch)
tree7a0a38202a5dec2f1e509f624eb86b5979f63e84 /git-sh-setup.sh
parent892c41b98ae2e6baf3aa13901cb10db9ac67d2f3 (diff)
downloadgit-7ae3df8c0aa3b7337ae9ac7b6184ac05985bf996.zip
git-7ae3df8c0aa3b7337ae9ac7b6184ac05985bf996.tar.gz
git-7ae3df8c0aa3b7337ae9ac7b6184ac05985bf996.tar.bz2
Use new semantics of is_bare/inside_git_dir/inside_work_tree
Up to now to check for a working tree this was used: !is_bare && !inside_git_dir (the check for bare is redundant because is_inside_git_dir returned already 1 for bare repositories). Now the check is: inside_work_tree && !inside_git_dir Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-sh-setup.sh')
-rwxr-xr-xgit-sh-setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 9ac657a..0de49e8 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -44,7 +44,7 @@ cd_to_toplevel () {
}
require_work_tree () {
- test $(is_bare_repository) = false &&
+ test $(git-rev-parse --is-inside-work-tree) = true &&
test $(git-rev-parse --is-inside-git-dir) = false ||
die "fatal: $0 cannot be used without a working tree."
}