mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/archive-prefix-with-add-virtual-file'

Browse Source 
"git archive --add-virtual-file=<path>:<contents>" never paid
attention to the --prefix=<prefix> option but the documentation
said it would. The documentation has been corrected.

* jc/archive-prefix-with-add-virtual-file:
  archive: document that --add-virtual-file takes full path
This commit is contained in:
Junio C Hamano
2024-07-08 14:53:07 -07:00
parent 5c9be4c9d6 72c282098d
commit 87f4164124
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-archive.txt
View File

@ -53,7 +53,7 @@ OPTIONS
--prefix=<prefix>/:: --prefix=<prefix>/::
Prepend <prefix>/ to paths in the archive. Can be repeated; its Prepend <prefix>/ to paths in the archive. Can be repeated; its
rightmost value is used for all tracked files. See below which rightmost value is used for all tracked files. See below which
value gets used by `--add-file` and `--add-virtual-file`. value gets used by `--add-file`.
-o <file>:: -o <file>::
--output=<file>:: --output=<file>::
@ -67,9 +67,7 @@ OPTIONS
--add-virtual-file=<path>:<content>:: --add-virtual-file=<path>:<content>::
Add the specified contents to the archive. Can be repeated to add Add the specified contents to the archive. Can be repeated to add
multiple files. The path of the file in the archive is built multiple files.
by concatenating the value of the last `--prefix` option (if any)
before this `--add-virtual-file` and `<path>`.
+ +
The `<path>` argument can start and end with a literal double-quote The `<path>` argument can start and end with a literal double-quote
character; the contained file name is interpreted as a C-style string, character; the contained file name is interpreted as a C-style string,
@ -81,6 +79,10 @@ if the path begins or ends with a double-quote character.
The file mode is limited to a regular file, and the option may be The file mode is limited to a regular file, and the option may be
subject to platform-dependent command-line limits. For non-trivial subject to platform-dependent command-line limits. For non-trivial
cases, write an untracked file and use `--add-file` instead. cases, write an untracked file and use `--add-file` instead.
+
Note that unlike `--add-file` the path created in the archive is not
affected by the `--prefix` option, as a full `<path>` can be given as
the value of the option.
--worktree-attributes:: --worktree-attributes::
Look for attributes in .gitattributes files in the working tree Look for attributes in .gitattributes files in the working tree