[PATCH 2/2] t7700: do not use "touch -r"
- From
Jeff King <peff@peff.net>
- Date
- Jan 23, 2014, 19:55 UTC
- Message-ID
- <20140123195518.GB31871@sigill.intra.peff.net>
- In-Reply-To
- <20140123195404.GA31314@sigill.intra.peff.net>
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. So we can simply drop the use of "-r".
Signed-off-by: Jeff King <peff@peff.net> --- t/t7700-repack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index d954b84..f9f9014 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 && + touch 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/ &&
-- 1.8.5.2.500.g8060133