Skip to content

Commit e595910

Browse files
jrngitster
authored andcommitted
Documentation/fast-import: put explanation of M 040000 <dataref> "" in context
Omit needless words ("Additionally ... <path> may also" is redundant). While at it, place the explanation of this special case after the general rules for paths to provide the reader with some context. Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5ee5f5a commit e595910

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Documentation/git-fast-import.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,6 @@ start with double quote (`"`).
534534
If an `LF` or double quote must be encoded into `<path>` shell-style
535535
quoting should be used, e.g. `"path/with\n and \" in it"`.
536536

537-
Additionally, in `040000` mode, `<path>` may also be an empty string
538-
(`""`) to specify the root of the tree.
539-
540537
The value of `<path>` must be in canonical form. That is it must not:
541538

542539
* contain an empty directory component (e.g. `foo//bar` is invalid),
@@ -545,6 +542,8 @@ The value of `<path>` must be in canonical form. That is it must not:
545542
* contain the special component `.` or `..` (e.g. `foo/./bar` and
546543
`foo/../bar` are invalid).
547544

545+
The root of the tree can be represented by an empty string as `<path>`.
546+
548547
It is recommended that `<path>` always be encoded using UTF-8.
549548

550549
`filedelete`

0 commit comments

Comments
 (0)