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-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,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 9DC6C1F8C2 for ; Mon, 8 Feb 2021 19:41:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236480AbhBHTjM (ORCPT ); Mon, 8 Feb 2021 14:39:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236313AbhBHThc (ORCPT ); Mon, 8 Feb 2021 14:37:32 -0500 Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39A3DC061788 for ; Mon, 8 Feb 2021 11:36:52 -0800 (PST) Received: by mail-qk1-x72d.google.com with SMTP id r77so15616173qka.12 for ; Mon, 08 Feb 2021 11:36:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=We1z4WjsMfB7oLZVfSyIgnT1EkSjSETjb155mnSchIU=; b=g6j4xmkRLZmxOKHAexaZTabHNe44Hez5sns8F3mgxqawxJ9s0jIp/xsc+cf72eR0AP f5stUoY99o/a1/8k/jGApNoOHMSiszHYgWATuAM7+UxnudukHaeUcWGPlz1U8zCjo65a Fx2tNFf+3AjBp1TGSs0/9LGPRbeVqMlYNEuFsesDfYTxi/h1S7uPWtzuOAD9c6W4nSj8 e/TdiHV3INs9SOLxgw+Fy7CTZuavV1X3QigyBoMqm1aiV2tKUAFW9xyvY95KGnjTQy+d j4ibaKIvgsHxPSKljsCIFzo71wE0MkGtUIzNoB9gzjtF0rgIFtoKtCAw5yv83/bE4iN4 7pcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=We1z4WjsMfB7oLZVfSyIgnT1EkSjSETjb155mnSchIU=; b=ExLO1apgbyerjIZ+p0iLrF+8NmdzVLG0N/3o3z+cHW49/5inxgklSXVFhwVoXTw7ZM 9q+ws19G0DsRCcKCH7M3YWM78jul1KyZdiCbzHI2LAPD7W4a58PbRKVS1MMvgALraDuk 4aw1WFNTWc9P0xerbSGVxFV6YI4UYHOr+Xn1v/28DcGnCMTCrQL5BAE08Ow7Z9hFuPpZ RScUm5GhSLrRXYzsEXib9wTa3J9lBnNKsG2oYoV7UE3nbv08mOuh8/RwzjzyPGjUMJ9V +LMj38kg+plzG7eYJaytRII/SPJyVpMrpQGgzwZZBtxhFMddJlUukrtjNafOegKxd89P Ks0Q== X-Gm-Message-State: AOAM532W0i5mfc9fRL4uG9n87UTk8kvC6J6+xMHAVxac83jIvxkIsIDA WgHvoO1jbAhVjm9neVGLScg7kXKOWH2QaA== X-Google-Smtp-Source: ABdhPJzbr059CqdmqffszgmVf6dzJDlqFhQz55AqOFQuN8bRWfiWN+4sMpZIQ+oKkzsN0RWQ6W68nA== X-Received: by 2002:a05:620a:146a:: with SMTP id j10mr18149727qkl.166.1612813010881; Mon, 08 Feb 2021 11:36:50 -0800 (PST) Received: from mango.meuintelbras.local ([177.32.118.149]) by smtp.gmail.com with ESMTPSA id h6sm15143808qtx.39.2021.02.08.11.36.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 11:36:50 -0800 (PST) From: Matheus Tavares To: git@vger.kernel.org Subject: [PATCH 2/2] checkout-index: omit entries with no tempname from --temp output Date: Mon, 8 Feb 2021 16:36:32 -0300 Message-Id: <1275701345b7e198ec83ad4fdcc2dda6d9775ef3.1612812581.git.matheus.bernardino@usp.br> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org With --temp (or --stage=all, which implies --temp), checkout-index writes a list to stdout associating temporary file names to the entries' names. But if it fails to write an entry, and the failure happens before even assigning a temporary filename to that entry, we get an odd output line. This can be seen when trying to check out a symlink whose blob is missing: $ missing_blob=$(git hash-object --stdin --- builtin/checkout-index.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 4bbfc92dce..a9f0f0a225 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -23,25 +23,38 @@ static struct checkout state = CHECKOUT_INIT; static void write_tempfile_record(const char *name, const char *prefix) { int i; + int have_tempname = 0; if (CHECKOUT_ALL == checkout_stage) { - for (i = 1; i < 4; i++) { - if (i > 1) - putchar(' '); - if (topath[i][0]) - fputs(topath[i], stdout); - else - putchar('.'); + for (i = 1; i < 4; i++) + if (topath[i][0]) { + have_tempname = 1; + break; + } + + if (have_tempname) { + for (i = 1; i < 4; i++) { + if (i > 1) + putchar(' '); + if (topath[i][0]) + fputs(topath[i], stdout); + else + putchar('.'); + } } - } else + } else if (topath[checkout_stage][0]) { + have_tempname = 1; fputs(topath[checkout_stage], stdout); + } - putchar('\t'); - write_name_quoted_relative(name, prefix, stdout, - nul_term_line ? '\0' : '\n'); + if (have_tempname) { + putchar('\t'); + write_name_quoted_relative(name, prefix, stdout, + nul_term_line ? '\0' : '\n'); - for (i = 0; i < 4; i++) { - topath[i][0] = 0; + for (i = 0; i < 4; i++) { + topath[i][0] = 0; + } } } -- 2.29.2