diff options
Diffstat (limited to 'man1/git-fast-import.1')
| -rw-r--r-- | man1/git-fast-import.1 | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 634e963fa..6ac2b478c 100644 --- a/man1/git-fast-import.1 +++ b/man1/git-fast-import.1 @@ -2,12 +2,12 @@ .\" Title: git-fast-import .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2024-04-22 +.\" Date: 2024-04-23 .\" Manual: Git Manual -.\" Source: Git 2.45.0.rc0.3.g00e10ef10e +.\" Source: Git 2.45.0.rc0.48.g10f1281498 .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "2024\-04\-22" "Git 2\&.45\&.0\&.rc0\&.3\&.g00" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "2024\-04\-23" "Git 2\&.45\&.0\&.rc0\&.48\&.g1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -250,7 +250,7 @@ except that no sanity checks on the numeric epoch and local offset are performed .PP \fBrfc2822\fR .RS 4 -This is the standard email format as described by RFC 2822\&. +This is the standard date format as described by RFC 2822\&. .sp An example value is \(lqTue Feb 6 11:22:18 2007 \-0500\(rq\&. The Git parser is accurate, but a little on the lenient side\&. It is the same parser used by \fIgit am\fR @@ -695,11 +695,13 @@ or .sp In both formats \fB<path>\fR is the complete path of the file to be added (if not already existing) or modified (if already existing)\&. .sp -A \fB<path>\fR string must use UNIX\-style directory separators (forward slash \fB/\fR), may contain any byte other than \fBLF\fR, and must not start with double quote (\fB"\fR)\&. +A \fB<path>\fR can be written as unquoted bytes or a C\-style quoted string\&. .sp -A path can use C\-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains \fBLF\fR\&. In C\-style quoting, the complete name should be surrounded with double quotes, and any \fBLF\fR, backslash, or double quote characters must be escaped by preceding them with a backslash (e\&.g\&., \fB"path/with\en, \e\e and \e" in it"\fR)\&. +When a \fB<path>\fR does not start with a double quote (\fB"\fR), it is an unquoted string and is parsed as literal bytes without any escape sequences\&. However, if the filename contains \fBLF\fR or starts with double quote, it cannot be represented as an unquoted string and must be quoted\&. Additionally, the source \fB<path>\fR in \fBfilecopy\fR or \fBfilerename\fR must be quoted if it contains SP\&. .sp -The value of \fB<path>\fR must be in canonical form\&. That is it must not: +When a \fB<path>\fR starts with a double quote (\fB"\fR), it is a C\-style quoted string, where the complete filename is enclosed in a pair of double quotes and escape sequences are used\&. Certain characters must be escaped by preceding them with a backslash: \fBLF\fR is written as \fB\en\fR, backslash as \fB\e\e\fR, and double quote as \fB\e"\fR\&. Some characters may optionally be written with escape sequences: \fB\ea\fR for bell, \fB\eb\fR for backspace, \fB\ef\fR for form feed, \fB\en\fR for line feed, \fB\er\fR for carriage return, \fB\et\fR for horizontal tab, and \fB\ev\fR for vertical tab\&. Any byte can be written with 3\-digit octal codes (e\&.g\&., \fB\e033\fR)\&. All filenames can be represented as quoted strings\&. +.sp +A \fB<path>\fR must use UNIX\-style directory separators (forward slash \fB/\fR) and its value must be in canonical form\&. That is it must not: .sp .RS 4 .ie n \{\ @@ -761,7 +763,7 @@ are invalid)\&. .sp The root of the tree can be represented by an empty string as \fB<path>\fR\&. .sp -It is recommended that \fB<path>\fR always be encoded using UTF\-8\&. +\fB<path>\fR cannot contain NUL, either literally or escaped as \fB\e000\fR\&. It is recommended that \fB<path>\fR always be encoded using UTF\-8\&. .RE .sp .it 1 an-trap |