Am 25.05.22 um 23:11 schrieb Junio C Hamano: > "Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx> > writes: > >> @@ -61,6 +61,17 @@ OPTIONS >> by concatenating the value for `--prefix` (if any) and the >> basename of <file>. >> >> +--add-virtual-file=<path>:<content>:: >> + Add the specified contents to the archive. Can be repeated to add >> + multiple files. The path of the file in the archive is built >> + by concatenating the value for `--prefix` (if any) and the >> + basename of <file>. > > This sentence was copy-pasted from --add-file without adjusting. > There is no <file>; this new feature gives <path>. > > Also, I suspect that the feature is losing end-user supplied > information without a good reason. --add-file=<file> may have > prepared an input in a randomly named temporary directory and it > would make quite a lot of sense to strip the leading directory > components from <file> and use only the basename part. But the > <path> given to "--add-virtual-file" does not refer to anything on > the filesystem. Its ONLY use is to be used as the path in the > archive to store the content. There is no justification why we > would discard the leading path components from it. Good point. > I am not > decided, but I am inclined to say that we should not honor > "--prefix". > > $ git archive --prefix=2.36.0 v2.36.0 > > would be a way to create a single directory and put everything in > the tree-ish in there, but there probably are cases where the user > of an "extra file" feature wants to add untracked cruft _in_ that > directory, and there are other cases where an extra file wants to go > to the top-level next to the 2.36.0 directory. A user can use the > same string as --prefix=<base> in front of <path> if the extra file > should go next to the top-level of the tree-ish, or without such > prefixing to place the extra file at the top-level. If the prefix is applied then a prefix-less extra file can by had by using --prefix= or --no-prefix for it and --prefix=... for the tree, e.g.: $ git archive --add-file=extra --prefix=dir/ v2.36.0 puts "extra" at the root and the rest under "dir". The order of arguments matters here, and the default prefix is the empty string. So extra files can be put anywhere even if --prefix is honored. Keeping the whole path from --add-virtual-file makes sense to me; I slightly prefer applying --prefix on top of that for consistency. René
