diff options
| author | Jeff King <peff@peff.net> | 2014-01-23 19:55:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-23 21:13:20 (GMT) |
| commit | a0332337be53f266682279c72a5e553986638c87 (patch) | |
| tree | 4dd146bb22c77057023cda61341a3015e738fa7f | |
| parent | 088304bf73b9b4149e04d2246fe08a06eef6e795 (diff) | |
| download | git-a0332337be53f266682279c72a5e553986638c87.zip git-a0332337be53f266682279c72a5e553986638c87.tar.gz git-a0332337be53f266682279c72a5e553986638c87.tar.bz2 | |
t7700: do not use "touch" unnecessarily
Some versions of touch (such as /usr/ucb/touch on Solaris)
do not know about the "-r" option. This would make sense as
a feature of test-chmtime, but fortunately this fix is even
easier.
The test does not care about the timestamp of the .keep file it
creates at all, only that it exists. For such a use case, with or
without portability issues around "-r", "touch" should not be used
in the first place.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7700-repack.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index d954b84..b45bd1e 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/ && |