Merge branch 'jk/test-fixes'

gitster · gitster · commit cdc40bdb6973 · 2014-01-27T10:45:46.000-08:00
* jk/test-fixes:
  t7700: do not use "touch" unnecessarily
  t7501: fix "empty commit" test with NO_PERL
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
@@ -57,6 +57,7 @@ test_expect_success 'using invalid commit with -C' '
 '
 
 test_expect_success 'nothing to commit' '
+	git reset --hard &&
 	test_must_fail git commit -m initial
 '
 
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
@@ -17,7 +17,7 @@ test_expect_success 'objects in packs marked .keep are not repacked' '
 	# The second pack will contain the excluded object
 	packsha1=$(git rev-list --objects --all | grep file2 |
 		git pack-objects pack) &&
-	touch -r pack-$packsha1.pack pack-$packsha1.keep &&
+	>pack-$packsha1.keep &&
 	objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 |
 		sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") &&
 	mv pack-* .git/objects/pack/ &&

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ test_expect_success 'using invalid commit with -C' '`
`57`	`57`	`'`
`58`	`58`
`59`	`59`	`test_expect_success 'nothing to commit' '`
	`60`	`+ git reset --hard &&`
`60`	`61`	`test_must_fail git commit -m initial`
`61`	`62`	`'`
`62`	`63`