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

gitster · gitster · commit b7380fa7a9ad · 2010-03-07T14:53:53.000-08:00
* gf/maint-sh-setup-nongit-ok:
  require_work_tree broken with NONGIT_OK
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
@@ -137,7 +137,7 @@ cd_to_toplevel () {
 }
 
 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."
 }
 

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ cd_to_toplevel () {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`require_work_tree () {`
`140`		`- test $(git rev-parse --is-inside-work-tree) = true \|\|`
	`140`	`+ test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true \|\|`
`141`	`141`	`die "fatal: $0 cannot be used without a working tree."`
`142`	`142`	`}`
`143`	`143`