From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_CSS,URIBL_CSS_A shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 711B21F4D7 for ; Thu, 12 May 2022 22:31:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356068AbiELWb1 (ORCPT ); Thu, 12 May 2022 18:31:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349298AbiELWbZ (ORCPT ); Thu, 12 May 2022 18:31:25 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F53556FA9 for ; Thu, 12 May 2022 15:31:25 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 2C5291368B9; Thu, 12 May 2022 18:31:22 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=7W6meANiQE9wqjEyvvuq5rwR5MsOPXoD56RKz0 9IWlk=; b=Vjoe1rfBJ8I//4zN6Shc8c+r0awjqXFnL2bNEArWC88dLF56fOYgiW Fd4jfSfmf07UydFO707BvKYJx3SGmERm3XOINo6wRAJv6/Xt2g965sY+JtnR7cjY aVfxPEtX9LPMiFRU0FcqSq8C35uctUP72tv01ZSBwjZNCsxhoDRjM= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 222061368B7; Thu, 12 May 2022 18:31:22 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.83.65.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 839981368B6; Thu, 12 May 2022 18:31:21 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Cc: "Johannes Schindelin via GitGitGadget" , =?utf-8?Q?Ren=C3=A9?= Scharfe , Taylor Blau , Derrick Stolee , Elijah Newren , Johannes Schindelin Subject: [PATCH] fixup! archive: optionally add "virtual" files References: <45662cf582ab7c8b1c32f55c9a34f4d73a28b71d.1652210824.git.gitgitgadget@gmail.com> Date: Thu, 12 May 2022 15:31:19 -0700 In-Reply-To: (Junio C. Hamano's message of "Tue, 10 May 2022 14:48:02 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 3FBBD0A8-D243-11EC-BA83-5E84C8D8090B-77302942!pb-smtp1.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- * 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