From fd5858b49bd0672d96026a9cff690c2b8730cb0c Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Thu, 14 Apr 2011 09:17:26 +0200 Subject: git.txt: fix list continuation Remove a spurious empty line which prevented asciidoc from recognizing a list continuation mark ('+'), so that it does not get output literally any more. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index 0c32d45248..5a174bcfc5 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -619,7 +619,6 @@ where: contents of , -hex:: are the 40-hexdigit SHA1 hashes, -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` -- cgit v1.2.3 From e3b02bc9533007f9e7aa9d7738a0f92c952dcff6 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Thu, 14 Apr 2011 19:38:13 +0200 Subject: t3306,t5304: avoid clock skew issues On systems where the local time and file modification time may be out of sync (e.g. test directory on NFS) t3306 and t5305 can fail because prune compares times such as "now" (client time) with file modification times (server times for remote file systems). I.e., these are spurious test failures. Avoid this by setting the relevant modification times to the local time. Noticed on a system with as little as 2s time skew. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- t/t3306-notes-prune.sh | 3 +++ t/t5304-prune.sh | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/t/t3306-notes-prune.sh b/t/t3306-notes-prune.sh index c4282179b3..86bf909ee3 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 e2ed13dba2..d645328609 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 ' -- cgit v1.2.3 From 810cae53e0f622d6804f063c04a83dbc3a11b7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 14 Apr 2011 20:04:57 +0200 Subject: archive: document limitation of tar.umask config setting The local value of the config variable tar.umask is not passed to the other side with --remote. We may want to change that, but for now just document this fact. Reported-by: Jacek Masiulaniec Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- Documentation/git-archive.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index bf5037ab2a..66943fdf83 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 ---------- -- cgit v1.2.3