Merge branch 'jk/repack-pack-keep-objects' into maint

diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index e70b98358b02e0d547bb2c7ed5d50b5c5753fee4..61e6ed37aa6fd6bff8bfe4d5c267c0ed3cad3db4 100755 (executable)
--- 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/ &&