From: "René Scharfe" <l.s.r@web.de>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Taylor Blau <me@ttaylorr.com>, Derrick Stolee <stolee@gmail.com>,
Elijah Newren <newren@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2 1/6] archive: optionally add "virtual" files
Date: Mon, 7 Feb 2022 20:55:02 +0100 [thread overview]
Message-ID: <d1e333b6-3ec1-8569-6ea9-4abd3dee1947@web.de> (raw)
In-Reply-To: <49ff3c1f2b32b16df2b4216aa016d715b6de46bc.1644187146.git.gitgitgadget@gmail.com>
Am 06.02.22 um 23:39 schrieb Johannes Schindelin via GitGitGadget:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> With the `--add-file-with-content=<path>:<content>` option, `git
> archive` now supports use cases where relatively trivial files need to
> be added that do not exist on disk.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> Documentation/git-archive.txt | 11 ++++++++
> archive.c | 51 +++++++++++++++++++++++++++++------
> t/t5003-archive-zip.sh | 12 +++++++++
> 3 files changed, 66 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
> index bc4e76a7834..1b52a0a65a1 100644
> --- a/Documentation/git-archive.txt
> +++ b/Documentation/git-archive.txt
> @@ -61,6 +61,17 @@ OPTIONS
> by concatenating the value for `--prefix` (if any) and the
> basename of <file>.
>
> +--add-file-with-content=<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>.
> ++
> +The `<path>` cannot contain any colon, the file mode is limited to
> +a regular file, and the option may be subject platform-dependent
s/subject/& to/
> +command-line limits. For non-trivial cases, write an untracked file
> +and use `--add-file` instead.
> +
We could use that option in Git's own Makefile to add the file named
"version", which contains $GIT_VERSION. Hmm, but it also contains a
terminating newline, which would be a bit tricky (but not impossible) to
add. Would it make sense to add one automatically if it's missing (e.g.
with strbuf_complete_line)? Not sure.
> --worktree-attributes::
> Look for attributes in .gitattributes files in the working tree
> as well (see <<ATTRIBUTES>>).
> diff --git a/archive.c b/archive.c
> index a3bbb091256..172efd690c3 100644
> --- a/archive.c
> +++ b/archive.c
> @@ -263,6 +263,7 @@ static int queue_or_write_archive_entry(const struct object_id *oid,
> struct extra_file_info {
> char *base;
> struct stat stat;
> + void *content;
> };
>
> int write_archive_entries(struct archiver_args *args,
> @@ -337,7 +338,13 @@ int write_archive_entries(struct archiver_args *args,
> strbuf_addstr(&path_in_archive, basename(path));
>
> strbuf_reset(&content);
> - if (strbuf_read_file(&content, path, info->stat.st_size) < 0)
> + if (info->content)
> + err = write_entry(args, &fake_oid, path_in_archive.buf,
> + path_in_archive.len,
> + info->stat.st_mode,
> + info->content, info->stat.st_size);
> + else if (strbuf_read_file(&content, path,
> + info->stat.st_size) < 0)
> err = error_errno(_("could not read '%s'"), path);
> else
> err = write_entry(args, &fake_oid, path_in_archive.buf,
> @@ -493,6 +500,7 @@ static void extra_file_info_clear(void *util, const char *str)
> {
> struct extra_file_info *info = util;
> free(info->base);
> + free(info->content);
> free(info);
> }
>
> @@ -514,14 +522,38 @@ static int add_file_cb(const struct option *opt, const char *arg, int unset)
> if (!arg)
> return -1;
>
> - path = prefix_filename(args->prefix, arg);
> - item = string_list_append_nodup(&args->extra_files, path);
> - item->util = info = xmalloc(sizeof(*info));
> + info = xmalloc(sizeof(*info));
> info->base = xstrdup_or_null(base);
> - if (stat(path, &info->stat))
> - die(_("File not found: %s"), path);
> - if (!S_ISREG(info->stat.st_mode))
> - die(_("Not a regular file: %s"), path);
> +
> + if (strcmp(opt->long_name, "add-file-with-content")) {
Equivalent to:
if (!strcmp(opt->long_name, "add-file")) {
I mention that because the inequality check confused me a bit at first.
> + path = prefix_filename(args->prefix, arg);
> + if (stat(path, &info->stat))
> + die(_("File not found: %s"), path);
> + if (!S_ISREG(info->stat.st_mode))
> + die(_("Not a regular file: %s"), path);
> + info->content = NULL; /* read the file later */
> + } else {
> + const char *colon = strchr(arg, ':');
> + char *p;
> +
> + if (!colon)
> + die(_("missing colon: '%s'"), arg);
> +
> + p = xstrndup(arg, colon - arg);
> + if (!args->prefix)
> + path = p;
> + else {
> + path = prefix_filename(args->prefix, p);
> + free(p);
> + }
> + memset(&info->stat, 0, sizeof(info->stat));
> + info->stat.st_mode = S_IFREG | 0644;
> + info->content = xstrdup(colon + 1);
> + info->stat.st_size = strlen(info->content);
> + }
> + item = string_list_append_nodup(&args->extra_files, path);
> + item->util = info;
> +
> return 0;
> }
>
> @@ -554,6 +586,9 @@ static int parse_archive_args(int argc, const char **argv,
> { OPTION_CALLBACK, 0, "add-file", args, N_("file"),
> N_("add untracked file to archive"), 0, add_file_cb,
> (intptr_t)&base },
> + { OPTION_CALLBACK, 0, "add-file-with-content", args,
> + N_("file"), N_("add untracked file to archive"), 0,
^^^^
"<file>" seems wrong, because there is no actual file. It should rather
be "<name>:<content>" for the virtual one, right?
> + add_file_cb, (intptr_t)&base },
> OPT_STRING('o', "output", &output, N_("file"),
> N_("write the archive to this file")),
> OPT_BOOL(0, "worktree-attributes", &worktree_attributes,
> diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
> index 1e6d18b140e..8ff1257f1a0 100755
> --- a/t/t5003-archive-zip.sh
> +++ b/t/t5003-archive-zip.sh
> @@ -206,6 +206,18 @@ test_expect_success 'git archive --format=zip --add-file' '
> check_zip with_untracked
> check_added with_untracked untracked untracked
>
> +test_expect_success UNZIP 'git archive --format=zip --add-file-with-content' '
> + git archive --format=zip >with_file_with_content.zip \
> + --add-file-with-content=hello:world $EMPTY_TREE &&
> + test_when_finished "rm -rf tmp-unpack" &&
> + mkdir tmp-unpack && (
> + cd tmp-unpack &&
> + "$GIT_UNZIP" ../with_file_with_content.zip &&
> + test_path_is_file hello &&
> + test world = $(cat hello)
> + )
> +'
> +
> test_expect_success 'git archive --format=zip --add-file twice' '
> echo untracked >untracked &&
> git archive --format=zip --prefix=one/ --add-file=untracked \
next prev parent reply other threads:[~2022-02-07 20:02 UTC|newest]
Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-26 8:41 [PATCH 0/5] scalar: implement the subcommand "diagnose" Johannes Schindelin via GitGitGadget
2022-01-26 8:41 ` [PATCH 1/5] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-01-26 9:34 ` René Scharfe
2022-01-26 22:20 ` Taylor Blau
2022-02-06 21:34 ` Johannes Schindelin
2022-01-27 19:38 ` Elijah Newren
2022-01-26 8:41 ` [PATCH 2/5] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-01-26 8:41 ` [PATCH 3/5] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-01-26 22:43 ` Taylor Blau
2022-01-27 15:14 ` Derrick Stolee
2022-02-06 21:38 ` Johannes Schindelin
2022-01-26 8:41 ` [PATCH 4/5] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-01-26 22:50 ` Taylor Blau
2022-01-27 15:17 ` Derrick Stolee
2022-01-27 18:59 ` Elijah Newren
2022-02-06 21:25 ` Johannes Schindelin
2022-01-26 8:41 ` [PATCH 5/5] scalar diagnose: show a spinner while staging content Johannes Schindelin via GitGitGadget
2022-01-27 15:19 ` [PATCH 0/5] scalar: implement the subcommand "diagnose" Derrick Stolee
2022-02-06 21:13 ` Johannes Schindelin
2022-02-06 22:39 ` [PATCH v2 0/6] " Johannes Schindelin via GitGitGadget
2022-02-06 22:39 ` [PATCH v2 1/6] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-02-07 19:55 ` René Scharfe [this message]
2022-02-07 23:30 ` Junio C Hamano
2022-02-08 13:12 ` Johannes Schindelin
2022-02-08 17:44 ` Junio C Hamano
2022-02-08 20:58 ` René Scharfe
2022-02-09 22:48 ` Junio C Hamano
2022-02-10 19:10 ` René Scharfe
2022-02-10 19:23 ` Junio C Hamano
2022-02-11 19:16 ` René Scharfe
2022-02-11 21:27 ` Junio C Hamano
2022-02-12 9:12 ` René Scharfe
2022-02-13 6:25 ` Junio C Hamano
2022-02-13 9:02 ` René Scharfe
2022-02-14 17:22 ` Junio C Hamano
2022-02-08 12:54 ` Johannes Schindelin
2022-02-06 22:39 ` [PATCH v2 2/6] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-02-06 22:39 ` [PATCH v2 3/6] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-02-07 19:55 ` René Scharfe
2022-02-08 12:08 ` Johannes Schindelin
2022-02-06 22:39 ` [PATCH v2 4/6] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-02-06 22:39 ` [PATCH v2 5/6] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-02-06 22:39 ` [PATCH v2 6/6] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 0/7] scalar: implement the subcommand "diagnose" Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget
2022-05-07 2:06 ` Elijah Newren
2022-05-09 21:04 ` Johannes Schindelin
2022-05-04 15:25 ` [PATCH v3 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-05-04 15:25 ` [PATCH v3 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-07 2:23 ` [PATCH v3 0/7] scalar: implement the subcommand "diagnose" Elijah Newren
2022-05-10 19:26 ` [PATCH v4 " Johannes Schindelin via GitGitGadget
2022-05-10 19:26 ` [PATCH v4 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-05-10 21:48 ` Junio C Hamano
2022-05-10 22:06 ` rsbecker
2022-05-10 23:21 ` Junio C Hamano
2022-05-11 16:14 ` René Scharfe
2022-05-11 19:27 ` Junio C Hamano
2022-05-12 16:16 ` René Scharfe
2022-05-12 18:15 ` Junio C Hamano
2022-05-12 21:31 ` Junio C Hamano
2022-05-14 7:06 ` René Scharfe
2022-05-12 22:31 ` [PATCH] fixup! " Junio C Hamano
2022-05-10 19:26 ` [PATCH v4 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget
2022-05-10 21:56 ` Junio C Hamano
2022-05-10 22:23 ` rsbecker
2022-05-19 18:12 ` Johannes Schindelin
2022-05-19 18:09 ` Johannes Schindelin
2022-05-19 18:44 ` Junio C Hamano
2022-05-10 19:27 ` [PATCH v4 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-05-17 14:51 ` Ævar Arnfjörð Bjarmason
2022-05-18 17:35 ` Junio C Hamano
2022-05-20 7:30 ` Ævar Arnfjörð Bjarmason
2022-05-20 15:55 ` Johannes Schindelin
2022-05-21 9:54 ` Ævar Arnfjörð Bjarmason
2022-05-22 5:50 ` Junio C Hamano
2022-05-24 12:25 ` Johannes Schindelin
2022-05-24 18:11 ` Ævar Arnfjörð Bjarmason
2022-05-24 19:29 ` Junio C Hamano
2022-05-25 10:31 ` Johannes Schindelin
2022-05-10 19:27 ` [PATCH v4 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-05-17 14:53 ` Ævar Arnfjörð Bjarmason
2022-05-10 19:27 ` [PATCH v4 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-05-10 19:27 ` [PATCH v4 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-05-10 19:27 ` [PATCH v4 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-17 15:03 ` [PATCH v4 0/7] scalar: implement the subcommand "diagnose" Ævar Arnfjörð Bjarmason
2022-05-17 15:28 ` rsbecker
2022-05-19 18:17 ` Johannes Schindelin
2022-05-19 18:17 ` [PATCH v5 " Johannes Schindelin via GitGitGadget
2022-05-19 18:17 ` [PATCH v5 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-05-20 14:41 ` René Scharfe
2022-05-20 16:21 ` Junio C Hamano
2022-05-19 18:17 ` [PATCH v5 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget
2022-05-19 18:17 ` [PATCH v5 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-05-19 18:18 ` [PATCH v5 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-05-19 18:18 ` [PATCH v5 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-05-19 18:18 ` [PATCH v5 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-05-19 18:18 ` [PATCH v5 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-19 19:23 ` [PATCH v5 0/7] scalar: implement the subcommand "diagnose" Junio C Hamano
2022-05-21 15:08 ` [PATCH v6 " Johannes Schindelin via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget
2022-05-25 21:11 ` Junio C Hamano
2022-05-26 9:09 ` René Scharfe
2022-05-26 17:10 ` Junio C Hamano
2022-05-26 18:57 ` René Scharfe
2022-05-26 20:16 ` Junio C Hamano
2022-05-27 17:02 ` René Scharfe
2022-05-27 19:01 ` Junio C Hamano
2022-05-28 6:57 ` René Scharfe
2022-05-21 15:08 ` [PATCH v6 2/7] archive --add-virtual-file: allow paths containing colons Johannes Schindelin via GitGitGadget
2022-05-25 20:22 ` Junio C Hamano
2022-05-25 21:42 ` Junio C Hamano
2022-05-25 22:34 ` Junio C Hamano
2022-05-21 15:08 ` [PATCH v6 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget
2022-05-21 15:08 ` [PATCH v6 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget
2022-05-28 23:11 ` [PATCH v6+ 0/7] js/scalar-diagnose rebased Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 1/7] archive: optionally add "virtual" files Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 2/7] archive --add-virtual-file: allow paths containing colons Junio C Hamano
2022-06-15 18:16 ` Adam Dinwoodie
2022-06-15 20:00 ` Junio C Hamano
2022-06-15 21:36 ` Adam Dinwoodie
2022-06-18 20:19 ` Johannes Schindelin
2022-06-18 22:05 ` Junio C Hamano
2022-06-20 9:41 ` Adam Dinwoodie
2022-05-28 23:11 ` [PATCH v6+ 3/7] scalar: validate the optional enlistment argument Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 4/7] scalar: implement `scalar diagnose` Junio C Hamano
2022-06-10 2:08 ` Ævar Arnfjörð Bjarmason
2022-06-10 16:44 ` Junio C Hamano
2022-06-10 17:35 ` Ævar Arnfjörð Bjarmason
2022-05-28 23:11 ` [PATCH v6+ 5/7] scalar diagnose: include disk space information Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 6/7] scalar: teach `diagnose` to gather packfile info Junio C Hamano
2022-05-28 23:11 ` [PATCH v6+ 7/7] scalar: teach `diagnose` to gather loose objects information Junio C Hamano
2022-05-30 10:12 ` [PATCH v6+ 0/7] js/scalar-diagnose rebased Johannes Schindelin
2022-05-30 17:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1e333b6-3ec1-8569-6ea9-4abd3dee1947@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).