[PATCH] fixup! archive: optionally add "virtual" files
From: Junio C Hamano <hidden>
Date: 2022-05-12 22:31:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
Do not let add_file_cb() assume that two existing callers are the only ones, and checking that the caller is not one of them is sufficient to determine it is the other one. Signed-off-by: Junio C Hamano <redacted> --- * To be squashed to the commit with the title in the series. The "What's cooking" report is getting crowded with too many topics marked as "Expecting a reroll", and I'm trying to do easier ones myself to see how much reduction we can make. archive.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/archive.c b/archive.c
index 477eba60ac..98c7449ea1 100644
--- a/archive.c
+++ b/archive.c@@ -533,7 +533,7 @@ static int add_file_cb(const struct option *opt, const char *arg, int unset) if (!S_ISREG(info->stat.st_mode)) die(_("Not a regular file: %s"), path); info->content = NULL; /* read the file later */ - } else { + } else if (!strcmp(opt->long_name, "add-file-with-content")) { struct strbuf buf = STRBUF_INIT; const char *p = arg;
@@ -560,6 +560,8 @@ static int add_file_cb(const struct option *opt, const char *arg, int unset) info->stat.st_mode = S_IFREG | 0644; info->content = xstrdup(p + 1); info->stat.st_size = strlen(info->content); + } else { + BUG("add_file_cb() called for %s", opt->long_name); } item = string_list_append_nodup(&args->extra_files, path); item->util = info;
--
2.36.1-338-g1c7f76a54c