Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6

* gf/maint-sh-setup-nongit-ok:
  require_work_tree broken with NONGIT_OK
This commit is contained in:
Junio C Hamano 2010-03-07 14:53:53 -08:00
commit b7380fa7a9

View File

@ -137,7 +137,7 @@ cd_to_toplevel () {
} }
require_work_tree () { require_work_tree () {
test $(git rev-parse --is-inside-work-tree) = true || test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
die "fatal: $0 cannot be used without a working tree." die "fatal: $0 cannot be used without a working tree."
} }