Merge branch 'rs/empty-archive' into maint

gitster · gitster · commit 167843f285fd · 2013-04-26T11:03:31.000-07:00
* rs/empty-archive:
  t5004: fix issue with empty archive test and bsdtar
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
@@ -28,7 +28,7 @@ check_dir() {
 }
 
 test_expect_success 'tar archive of empty tree is empty' '
-	git archive --format=tar HEAD >empty.tar &&
+	git archive --format=tar HEAD: >empty.tar &&
 	make_dir extract &&
 	"$TAR" xf empty.tar -C extract &&
 	check_dir extract

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ check_dir() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`test_expect_success 'tar archive of empty tree is empty' '`
`31`		`- git archive --format=tar HEAD >empty.tar &&`
	`31`	`+ git archive --format=tar HEAD: >empty.tar &&`
`32`	`32`	`make_dir extract &&`
`33`	`33`	`"$TAR" xf empty.tar -C extract &&`
`34`	`34`	`check_dir extract`