Merge branch 'rr/doc-content-type'

diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index e2ed13dba2705b15d6a1f623589acce134749fab..d645328609c9ec63782a0b9f80c31a73ef745802 100755 (executable)
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -14,7 +14,8 @@ add_blob() {
        BLOB=$(echo aleph_0 | git hash-object -w --stdin) &&
        BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
        test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
-       test -f $BLOB_FILE
+       test -f $BLOB_FILE &&
+       test-chmtime =+0 $BLOB_FILE
 }
 
 test_expect_success setup '