Merge branch 'maint'
* maint: archive: document limitation of tar.umask config setting t3306,t5304: avoid clock skew issues git.txt: fix list continuationmaint
commit
4d8b32a2e1
|
@ -98,7 +98,8 @@ tar.umask::
|
||||||
tar archive entries. The default is 0002, which turns off the
|
tar archive entries. The default is 0002, which turns off the
|
||||||
world write bit. The special value "user" indicates that the
|
world write bit. The special value "user" indicates that the
|
||||||
archiving user's umask will be used instead. See umask(2) for
|
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
|
ATTRIBUTES
|
||||||
----------
|
----------
|
||||||
|
|
|
@ -622,7 +622,6 @@ where:
|
||||||
contents of <old|new>,
|
contents of <old|new>,
|
||||||
<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
|
<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
|
||||||
<old|new>-mode:: are the octal representation of the file modes.
|
<old|new>-mode:: are the octal representation of the file modes.
|
||||||
|
|
||||||
+
|
+
|
||||||
The file parameters can point at the user's working file
|
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`
|
(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
|
||||||
|
|
|
@ -20,6 +20,9 @@ test_expect_success 'setup: create a few commits with notes' '
|
||||||
git add file3 &&
|
git add file3 &&
|
||||||
test_tick &&
|
test_tick &&
|
||||||
git commit -m 3rd &&
|
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"
|
git notes add -m "Note #3"
|
||||||
'
|
'
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,8 @@ add_blob() {
|
||||||
BLOB=$(echo aleph_0 | git hash-object -w --stdin) &&
|
BLOB=$(echo aleph_0 | git hash-object -w --stdin) &&
|
||||||
BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
|
BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
|
||||||
test $((1 + $before)) = $(git count-objects | 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 '
|
test_expect_success setup '
|
||||||
|
|
Loading…
Reference in New Issue