diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:45:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:45:46 -0800 |
| commit | cdc40bdb6973dacff521422c8cbb650be7148152 (patch) | |
| tree | 4c05b486faadd9d08d56d8e3ad35f4b25f3df537 | |
| parent | Merge branch 'nd/negative-pathspec' (diff) | |
| parent | t7700: do not use "touch" unnecessarily (diff) | |
| download | tgif-cdc40bdb6973dacff521422c8cbb650be7148152.tar.xz | |
Merge branch 'jk/test-fixes'
* jk/test-fixes:
t7700: do not use "touch" unnecessarily
t7501: fix "empty commit" test with NO_PERL
| -rwxr-xr-x | t/t7501-commit.sh | 1 | ||||
| -rwxr-xr-x | t/t7700-repack.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index f04798f872..94eec83b37 100755 --- 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 index d954b846a1..b45bd1e76c 100755 --- 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/ && |