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

* gf/maint-sh-setup-nongit-ok:
  require_work_tree broken with NONGIT_OK
This commit is contained in:
Junio C Hamano 2010-03-02 12:44:07 -08:00
commit 8acd141bb5

View File

@ -128,7 +128,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."
} }