diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-14 12:26:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-14 12:26:45 -0700 |
| commit | 4d8b32a2e1758236c4c1b714f179892e3bce982c (patch) | |
| tree | 88de20125ca7645de923cf7abf7b1d69fa7b1105 | |
| parent | 865d370c4daf21e3d6dd48708fc4b716b63d795c (diff) | |
| parent | 810cae53e0f622d6804f063c04a83dbc3a11b7ca (diff) | |
| download | git-4d8b32a2e1758236c4c1b714f179892e3bce982c.tar.gz git-4d8b32a2e1758236c4c1b714f179892e3bce982c.tar.xz | |
Merge branch 'maint'
* maint:
archive: document limitation of tar.umask config setting
t3306,t5304: avoid clock skew issues
git.txt: fix list continuation
| -rw-r--r-- | Documentation/git-archive.txt | 3 | ||||
| -rw-r--r-- | Documentation/git.txt | 1 | ||||
| -rwxr-xr-x | t/t3306-notes-prune.sh | 3 | ||||
| -rwxr-xr-x | t/t5304-prune.sh | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index f2b868459..9c750e244 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -98,7 +98,8 @@ tar.umask:: tar archive entries. The default is 0002, which turns off the world write bit. The special value "user" indicates that the archiving user's umask will be used instead. See umask(2) for - details. + details. If `--remote` is used then only the configuration of + the remote repository takes effect. ATTRIBUTES ---------- diff --git a/Documentation/git.txt b/Documentation/git.txt index 7df49ea0d..b8fa77b7a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -622,7 +622,6 @@ where: contents of <old|new>, <old|new>-hex:: are the 40-hexdigit SHA1 hashes, <old|new>-mode:: are the octal representation of the file modes. - + The file parameters can point at the user's working file (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` diff --git a/t/t3306-notes-prune.sh b/t/t3306-notes-prune.sh index c4282179b..86bf909ee 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 e2ed13dba..d64532860 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 ' |