Skip to content

Commit

Permalink
Merge branch 'jk/test-fixes'
Browse files Browse the repository at this point in the history
* jk/test-fixes:
  t7700: do not use "touch" unnecessarily
  t7501: fix "empty commit" test with NO_PERL
  • Loading branch information
Junio C Hamano committed Jan 27, 2014
2 parents 017f804 + a033233 commit cdc40bd
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions t/t7501-commit.sh
Original file line number Diff line number Diff line change
@@ -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
'

2 changes: 1 addition & 1 deletion t/t7700-repack.sh
Original file line number Diff line number Diff line change
@@ -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/ &&

0 comments on commit cdc40bd

Please sign in to comment.