Merge branch 'maint'

* maint:
archive: document limitation of tar.umask config setting
t3306,t5304: avoid clock skew issues
git.txt: fix list continuation

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index f2b8684596576cd515e617ea68f06a479348b522..9c750e24446b58efc2bd8d5e44566d060eaa353a 100644 (file)
--- 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 7df49ea0d288f65737568b2746c4e404e55cd06d..b8fa77b7ac44a644cca837352df3e02fd97d636b 100644 (file)
--- 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 c4282179b387c75e084d05075a7fd365c3220cdc..86bf909ee3dfca78f678fdefe961772dcd78d6b1 100755 (executable)
--- 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 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 '