diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-14 19:26:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-14 19:26:45 (GMT) |
| commit | 4d8b32a2e1758236c4c1b714f179892e3bce982c (patch) | |
| tree | 88de20125ca7645de923cf7abf7b1d69fa7b1105 /t | |
| parent | 865d370c4daf21e3d6dd48708fc4b716b63d795c (diff) | |
| parent | 810cae53e0f622d6804f063c04a83dbc3a11b7ca (diff) | |
| download | git-4d8b32a2e1758236c4c1b714f179892e3bce982c.zip git-4d8b32a2e1758236c4c1b714f179892e3bce982c.tar.gz git-4d8b32a2e1758236c4c1b714f179892e3bce982c.tar.bz2 | |
Merge branch 'maint'
* maint:
archive: document limitation of tar.umask config setting
t3306,t5304: avoid clock skew issues
git.txt: fix list continuation
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3306-notes-prune.sh | 3 | ||||
| -rwxr-xr-x | t/t5304-prune.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/t/t3306-notes-prune.sh b/t/t3306-notes-prune.sh index c428217..86bf909 100755 --- a/t/t3306-notes-prune.sh +++ b/t/t3306-notes-prune.sh @@ -20,6 +20,9 @@ test_expect_success 'setup: create a few commits with notes' ' git add file3 && test_tick && git commit -m 3rd && + COMMIT_FILE=.git/objects/5e/e1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && + test -f $COMMIT_FILE && + test-chmtime =+0 $COMMIT_FILE && git notes add -m "Note #3" ' diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index e2ed13d..d645328 100755 --- 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 ' |