From patchwork Sat Mar 26 17:14:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12792637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27732C433F5 for ; Sat, 26 Mar 2022 17:14:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231480AbiCZRQM (ORCPT ); Sat, 26 Mar 2022 13:16:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229899AbiCZRQK (ORCPT ); Sat, 26 Mar 2022 13:16:10 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AC6535844 for ; Sat, 26 Mar 2022 10:14:32 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id b19so14641560wrh.11 for ; Sat, 26 Mar 2022 10:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EadTkMciLhjGR6QcebbyJkkFyqLNtd7O1LT9DEwGC0k=; b=f8Uz5I1n6FTZ8d+5EdXLfDJdP7goCQpe0SynYjVLMn928LGVueVryNxmXkMJlHmG4s yLALiSD0KviPISqLC/0cozmDA6qGN178The4ekWRIY664Cw9BCc17gGqT0YZWpq3MHFL 4u0ucyfyIb7lrgVxS3OnV4r42UWrYNyK6CMEDoF0c2EwPviqkTkL0+2mzgmF52uVy0kE 7+B8d6DY2bJNWj9p9JlIddFceQBd8prLhbG6t0Dhl2gUJNAVCu/NPIwbq77ln+/jlfnS kRpe92OTw+HQtvPNLjp3ri5Ce3lgqEUd+awzEZcCeX1Gi1RVtsvSFiExWngfbakxn8Bv Y5ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EadTkMciLhjGR6QcebbyJkkFyqLNtd7O1LT9DEwGC0k=; b=o8EIh51nMAjFQe5Jxwv87ZM3+6G9osJuLoFewBMgv+Mp5c/JnMjNRSps9jIYdmdnsO 40K8RE3yZfDDYA90WA9h6M2m23wteF6WoHOni+gNd7mksiajsR6OsW8+MOeb0dQUKFrc oE5ivsjIc3zEsSykbjPszptAorXdQbrroFG92eUecruiRqzLW4/JtzjdIiTUrB5VW3g5 y8LJpeTb42GzAIuE/qZn+21hpBAlXO9nwBU80YoHJZMmS9zDNiETDsamxM+yFoBx6n4m XxLQxSfwj2z2da+e+pSCHH39nEyqd/MOxsndhJ9DrYVRgY241WMXi0uxGkUwBf4OXpL4 7+JQ== X-Gm-Message-State: AOAM5301S1DPQHx+YIDIYHFepuYmXxg8v17c643Vlu3RAuFyKZRev6Kr Iap4o0X8WyqJV/IavRyKFzky9MfQMv2qxQ== X-Google-Smtp-Source: ABdhPJzx2XVHIDH+ihplumGj7GHZTAcEJ5xae5bqQpP5Rr9iwvHhjshlisxWIcC5HqxHdpKK0wPoCw== X-Received: by 2002:a05:6000:1688:b0:205:a693:134c with SMTP id y8-20020a056000168800b00205a693134cmr7697318wrd.558.1648314870788; Sat, 26 Mar 2022 10:14:30 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c4f1300b0038cb924c3d7sm7805913wmq.45.2022.03.26.10.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 10:14:30 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 1/7] run-command.h: remove always unused "clean_on_exit_handler_cbdata" Date: Sat, 26 Mar 2022 18:14:13 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1535.gf8d72b9da1e In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove a "struct child_process" member added in ac2fbaa674c (run-command: add clean_on_exit_handler, 2016-10-16), but which was never used. Signed-off-by: Ævar Arnfjörð Bjarmason --- run-command.h | 1 - 1 file changed, 1 deletion(-) diff --git a/run-command.h b/run-command.h index 07bed6c31b4..5bd0c933e80 100644 --- a/run-command.h +++ b/run-command.h @@ -142,7 +142,6 @@ struct child_process { unsigned clean_on_exit:1; unsigned wait_after_clean:1; void (*clean_on_exit_handler)(struct child_process *process); - void *clean_on_exit_handler_cbdata; }; #define CHILD_PROCESS_INIT { \ From patchwork Sat Mar 26 17:14:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12792643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 794CEC4332F for ; Sat, 26 Mar 2022 17:14:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233535AbiCZRQT (ORCPT ); Sat, 26 Mar 2022 13:16:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231704AbiCZRQM (ORCPT ); Sat, 26 Mar 2022 13:16:12 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 555DC3585D for ; Sat, 26 Mar 2022 10:14:33 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id u16so14682933wru.4 for ; Sat, 26 Mar 2022 10:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aUyH4Qw4hoNidtaKQcAE+HZ3wX31UE41Wx4eSFEcQ+I=; b=n9+HriEKOqlb8P31hVSKWkogLALVFPS8jHZ87c1VTiHHgdIsWTeu1X7U802tWk784g 8gvLtptwIVGkyUGSlKt9NL6ToAySTPyyUoc5Kqh0h0u52DGF0Cc5m6Eqbk+0jSXtglxk mqf/MoiHE3cLNaBLlzaii/O483/fFFudRFAp7zxlPN/zwJfKwCtDpEagAEOygcoJ6VjJ yURQf9TObZkVLya26BEd7TW77NpAvfaaeNfMtrjUVgznRS5ozlR8RE3CEh1WITnXCbHD BgwRWY4VeZCmhskih74RXW3xwDZCqAojkAq6XJUWRjyhrO0SgogZei+teFE/oTwB8Xk/ Is9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aUyH4Qw4hoNidtaKQcAE+HZ3wX31UE41Wx4eSFEcQ+I=; b=cOm+JImLzn2lPgE3DjB32QyAyElN/QCKx6Z6y7HiwuMazgNbhInKjWLxMgANXBZjR0 IxwWrKFTDmzH0e2InN4Sq3W+Q29dqkGsV80l7lqW+9o4OYfTU5GXbinYYqdnqFEGnfij nThnD/qkFdre8sbaNF+Ntc0s43Yrnn3qoDr1+X+b+g4H584WCyTp2km/5EvsvRjoysD+ TRU9eXhYpobTqVrrm6qvL+/HIoGJE++reLb/Utu23F5V9OAMCm9UgoA0gsZ/jZLJJbJc ncA5+xBpARvXOKGfpfsAcikpaEDKnLBKH7CnfBYYAMpRdwWLjv3rqUb/zbCRXhicjoCc 24bw== X-Gm-Message-State: AOAM533CupuTuCNwOM/GKJittsRJ+r8/5VcywhxMCHTmJktCWbos3ANg jdXthysEp3Q8qnAevLe7s89CDkqzRe/MlQ== X-Google-Smtp-Source: ABdhPJz3sPe60UpgAzCGYbn9JxNOHu6u3LXJcqO7CkWsdJTy7kBv3CK0yzLvXwuJXeppha9XB1Qdog== X-Received: by 2002:adf:ed44:0:b0:203:f01a:8823 with SMTP id u4-20020adfed44000000b00203f01a8823mr14401151wro.715.1648314871502; Sat, 26 Mar 2022 10:14:31 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c4f1300b0038cb924c3d7sm7805913wmq.45.2022.03.26.10.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 10:14:30 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 2/7] configure.ac: remove USE_PIC comment Date: Sat, 26 Mar 2022 18:14:14 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1535.gf8d72b9da1e In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove a comment about a Makefile knob that was removed in f7661ce0b8e (Remove -fPIC which was only needed for Git.xs, 2006-09-29). The comment had been copied over to configure.ac in 633b423961d (Copy description of build configuration variables to configure.ac, 2006-07-08). Signed-off-by: Ævar Arnfjörð Bjarmason --- configure.ac | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6bd6bef1c44..789dcde3eae 100644 --- a/configure.ac +++ b/configure.ac @@ -1189,9 +1189,6 @@ AC_COMPILE_IFELSE([BSD_SYSCTL_SRC], GIT_CONF_SUBST([HAVE_BSD_SYSCTL]) ## Other checks. -# Define USE_PIC if you need the main git objects to be built with -fPIC -# in order to build and link perl/Git.so. x86-64 seems to need this. -# # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link. # Enable it on Windows. By default, symrefs are still used. # From patchwork Sat Mar 26 17:14:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12792639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5037C433EF for ; Sat, 26 Mar 2022 17:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233391AbiCZRQR (ORCPT ); Sat, 26 Mar 2022 13:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232216AbiCZRQM (ORCPT ); Sat, 26 Mar 2022 13:16:12 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98FE635864 for ; Sat, 26 Mar 2022 10:14:34 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id r7so6042370wmq.2 for ; Sat, 26 Mar 2022 10:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oDxh8upBo/U6/bc0tZXVn53L22i7wxd0KvIxVuk+5xs=; b=CJ/81h80C/p/WrQIrOqaqhBQm61QT/Nq3maBOr7fBt7SA7/Tdc8vDEbZt053FMRa8k rlG/vxJdCbh4eaeYEqU+oD1yFUKo1NYwPbHI8akqlTxe723aDuBcMAkEfVV/wFXMqouj Hg3C9uPDzdhvx15w6l28Gwnv1ESaEQgU4NOcRO/wNRIOBsWUG+wRXIvQT93I4brP6ttL jknOLGn4LcCnHdFnexctf0ARXzPVRtmkZXJZIAaSgqNx3YIF/d4B/sdB5CLbqkKPqAhr mC98+6zx+iydDxglOYdxGSvy5kNaOt68NFcxW0GISVRk8A/3j6r2i5N8fh9+1xx7ReNO h+XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oDxh8upBo/U6/bc0tZXVn53L22i7wxd0KvIxVuk+5xs=; b=s58anjdSjH6FGgrnwWjbpxc2WhVzKWw8FSPuv0jdYBjrjaJJpTp3CsB6FAtrW6Dtis rjdBZTLLJmEIJ974vIvit4EdVZYUGgo0JCO5NXAmB6Wn+l3cIgP2lfUvlt9A+bFbmHyJ bXnU3vnVUe8LruXAzc+Rluton4LA2GstvxwrBxlcm/vriWwMVFt8YAekMK14M8jZ1v+V IFCtCt5cnfWf1iS3ue5JbkiIYUZyLVDlh78S59AYwOJi8uToixHJeJDApn3vTPW/4Vox 0OAqj9ognZ3GgDq60uTedOt9+C7WdFCUajKaOzRQ72tVTb789G+5pHRyczgnMvUfXV0U 30GA== X-Gm-Message-State: AOAM530fN4kXZWj9z0l71kbrwYzEaGV1qvXv84mCjeOJRgJE/h+1sZRK 8c/dV8OkR4yHRilLV76MIWSzVhDlKmiqzg== X-Google-Smtp-Source: ABdhPJzcCO9KCiU+DB6w8CJJWaEwKHAUQA1FbkEz9w9e51rAkVNNRuEZFcrZVNxpv9YJ/dIrsx+wIA== X-Received: by 2002:a05:600c:19cf:b0:38c:b1fd:1fc9 with SMTP id u15-20020a05600c19cf00b0038cb1fd1fc9mr16013726wmq.103.1648314872771; Sat, 26 Mar 2022 10:14:32 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c4f1300b0038cb924c3d7sm7805913wmq.45.2022.03.26.10.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 10:14:32 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 3/7] xdiff/xmacros.h: remove unused XDL_PTRFREE Date: Sat, 26 Mar 2022 18:14:15 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1535.gf8d72b9da1e In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This macro was added in 3443546f6ef (Use a *real* built-in diff generator, 2006-03-24), but none of the xdiff code uses it, it uses xdl_free() directly. If we need its functionality again we'll use the FREE_AND_NULL() macro added in 481df65f4f7 (git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL, 2017-06-15). Signed-off-by: Ævar Arnfjörð Bjarmason --- xdiff/xmacros.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h index 2809a28ca96..ae4636c2477 100644 --- a/xdiff/xmacros.h +++ b/xdiff/xmacros.h @@ -34,7 +34,6 @@ #define XDL_ADDBITS(v,b) ((v) + ((v) >> (b))) #define XDL_MASKBITS(b) ((1UL << (b)) - 1) #define XDL_HASHLONG(v,b) (XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b)) -#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0) #define XDL_LE32_PUT(p, v) \ do { \ unsigned char *__p = (unsigned char *) (p); \ From patchwork Sat Mar 26 17:14:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12792638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AF50C433EF for ; Sat, 26 Mar 2022 17:14:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232727AbiCZRQO (ORCPT ); Sat, 26 Mar 2022 13:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231805AbiCZRQM (ORCPT ); Sat, 26 Mar 2022 13:16:12 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F3BD35844 for ; Sat, 26 Mar 2022 10:14:35 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id p12-20020a05600c430c00b0038cbdf52227so6092838wme.2 for ; Sat, 26 Mar 2022 10:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wiBv7ZUjybSR/SpCu7zmrYGSdGFuPZRTg18H8R6reX8=; b=XompFu9i5HCF0riaUh8C8C9KT8j3N4hvQwVELT5lTCFx1pTFSGFCWh1dqmnWHbwxCl qfafEQkd9ZJUZQIuyam08+9Lnc2Sdnu2qfNm1r4YeL/YF+mMZaSrjwSgWsJNE+GxdOJR dqXLBCTVIbUXArvk9bU2m8Qio7NDEGXwzewzH75I+5MPIwQqOzaCq0CrQEXqLkl+FZFL dfAkwb4PmZXhwGRuwYomXwyMr+56vGqJaNAl9TD5ETAifXQYWMbIi7oTD3NehVxJu2s0 xNkQuRAqocf27KFSkjnoA+c/1wzp+rI0uqXC38CbgFFyZOBkHWepUhCtm0hYcW4mfB+E 2gCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wiBv7ZUjybSR/SpCu7zmrYGSdGFuPZRTg18H8R6reX8=; b=HSElumpT7d5RLg3l0NwERM1rpjo1qlN86Ml4mcUOJ/sq6rS6li1bBd/x5d8/D2rX7y fkRb9JP4NQg4VRQYHpwCJDheRk7gXSQ41tRtwkmkZEUnur2HfUoCVbhFe/BGcOiOCVwi kmLy9yeQZgqsAP+ySE2bJnhUFQnYnr86ixLGo39q9Vytk7UuHL3we8RleDlpHB7bUpC/ X05RMiD1iZ5UJJg0YrNH5w3b7wWJ/3ppbOAWDM2sm1ZsVICBBdO8CFqMEELgnaY4oPRT m5+KxngBA0BnL2PeSz8QeufFLBX6eRR0zzfkEUJevdhpkEoFc1wRUBez6/fHZCx3oWZd zYPQ== X-Gm-Message-State: AOAM532cVChSQd/yabzX+Z3wJVTHlFGnYMFpHPKB0V5F47hQ/CbpVopH LdUtApmc5K68mYyUIEv7wm2kIerDQev3yg== X-Google-Smtp-Source: ABdhPJxHcWOgvyaP1rlzG02n/CmO+hvocBkGPJxcYwabpwS7G1ZaDBnTlFQ/cgBgonh8wyxd64XBuA== X-Received: by 2002:a7b:c017:0:b0:38c:8a13:466d with SMTP id c23-20020a7bc017000000b0038c8a13466dmr25649521wmb.128.1648314873690; Sat, 26 Mar 2022 10:14:33 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c4f1300b0038cb924c3d7sm7805913wmq.45.2022.03.26.10.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 10:14:33 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 4/7] pack-bitmap-write: remove unused bitmap_reset() function Date: Sat, 26 Mar 2022 18:14:16 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1535.gf8d72b9da1e In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This function hasn't been used since 449fa5ee069 (pack-bitmap-write: ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit intending to get rid of the code around the reusing of bitmaps. Signed-off-by: Ævar Arnfjörð Bjarmason --- ewah/bitmap.c | 5 ----- ewah/ewok.h | 1 - 2 files changed, 6 deletions(-) diff --git a/ewah/bitmap.c b/ewah/bitmap.c index 38a47c44db4..87d5cc8fa30 100644 --- a/ewah/bitmap.c +++ b/ewah/bitmap.c @@ -216,11 +216,6 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other) return 0; } -void bitmap_reset(struct bitmap *bitmap) -{ - memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t)); -} - void bitmap_free(struct bitmap *bitmap) { if (bitmap == NULL) diff --git a/ewah/ewok.h b/ewah/ewok.h index 66920965da1..7eb8b9b6301 100644 --- a/ewah/ewok.h +++ b/ewah/ewok.h @@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src); void bitmap_set(struct bitmap *self, size_t pos); void bitmap_unset(struct bitmap *self, size_t pos); int bitmap_get(struct bitmap *self, size_t pos); -void bitmap_reset(struct bitmap *self); void bitmap_free(struct bitmap *self); int bitmap_equals(struct bitmap *self, struct bitmap *other); int bitmap_is_subset(struct bitmap *self, struct bitmap *other); From patchwork Sat Mar 26 17:14:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12792641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E219EC433EF for ; Sat, 26 Mar 2022 17:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234201AbiCZRQU (ORCPT ); Sat, 26 Mar 2022 13:16:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229899AbiCZRQN (ORCPT ); Sat, 26 Mar 2022 13:16:13 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DCF035865 for ; Sat, 26 Mar 2022 10:14:36 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id r190-20020a1c2bc7000000b0038a1013241dso6089178wmr.1 for ; Sat, 26 Mar 2022 10:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EKzKA0n9K+9vEEnaNJzC9u78kulRkCT0O8HR4A9ie9Y=; b=mL1+L4ZL5wmY3pHewmxidA3VtGsI6rrhnhnjPSRbi/dhTQQghYQrXfCbMzQW3cvF5N zbGfL5lAYJc88SspW2QeOAWsbycYYm48QnOgx6FlaK2HNZx3XIA4OblI+9XEWe5tktVh 4tLgangds42w1LFM8ll7w74sFuSInhJxNG1eFqtmj0bxJ+FUYwPoGAsAK9LI3AVYvAwl RjreG7dG4f4jA83LsGNLR19dBLDVIUtWAu4QT7cBa/6m7hVMvxQ+rM/zumIJ33Kk6Ahc dvKaVbNpdrf8WHih9fVdswpSFMSjqnlIulpVO42yq2AyZQvpgUDQKYMG9n8JpeiDOZpJ RrjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EKzKA0n9K+9vEEnaNJzC9u78kulRkCT0O8HR4A9ie9Y=; b=fooEEZGy11p51xrb5V5MdnUHu/32hG1aJ3Kh4UWNvSNTOjQaw9WA8EToA4BFBK1u+0 t1ZzE4cpr6kO9O6qx171rgPN9ChhlEGPtl4/L56JU0AUxG/T2nMwlBposCtjRhKs4Qci wa1YRxbmUXlTbo7f/BCUT+By4fzSZwVpkftvBtGC15kVlmq4rjGlWKZbLgpMlxJ6SYyZ WQCIMj5VJdk7JvNiAegwRjg5lxc+Gd3m+ywwA4fVoaTDFel2nOkyJU4/oGGu6E4jczdm QseFVowiED7wu7H8wztazzeFx4sk4hACuCzU8yL8lO11pco9uPOw7W3r0JtcAIUFXB4E RUFQ== X-Gm-Message-State: AOAM530XJ7vBMiaN9+SvKZkkoyzo69p1Bdfay2zrbNx6XzM5zFVXwwae r0yHfWPTUfHZNMa9IZe+lNKKg5ALQ1oWow== X-Google-Smtp-Source: ABdhPJygnnvjpGpr2mgKhc481IkEetWnvw9i/16acLVrKJdK7XigOSLDHTURuaiOMpXSIWf6F3YNUw== X-Received: by 2002:a05:600c:3ca8:b0:38c:6dc6:6de0 with SMTP id bg40-20020a05600c3ca800b0038c6dc66de0mr25473134wmb.159.1648314874475; Sat, 26 Mar 2022 10:14:34 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c4f1300b0038cb924c3d7sm7805913wmq.45.2022.03.26.10.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 10:14:33 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 5/7] object-store.h: remove unused has_sha1_file*() Date: Sat, 26 Mar 2022 18:14:17 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1535.gf8d72b9da1e In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org These macros were last used in 5d3679ee023 (sha1-file: drop has_sha1_file(), 2019-01-07), so let's remove coccinelle migration rules added 9b45f499818 (object-store: prepare has_{sha1, object}_file to handle any repo, 2018-11-13), along with the compatibility macros themselves. The "These functions.." in the diff context and the general comment about compatibility macros still applies to "NO_THE_REPOSITORY_COMPATIBILITY_MACROS" use just a few lines below this, so let's keep the comment. Signed-off-by: Ævar Arnfjörð Bjarmason --- contrib/coccinelle/the_repository.pending.cocci | 15 --------------- object-store.h | 4 ---- 2 files changed, 19 deletions(-) diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci index 2ee702ecf7f..072ea0d9228 100644 --- a/contrib/coccinelle/the_repository.pending.cocci +++ b/contrib/coccinelle/the_repository.pending.cocci @@ -11,21 +11,6 @@ expression G; + repo_read_object_file(the_repository, E, F, G) -@@ -expression E; -@@ -- has_sha1_file( -+ repo_has_sha1_file(the_repository, - E) - -@@ -expression E; -expression F; -@@ -- has_sha1_file_with_flags( -+ repo_has_sha1_file_with_flags(the_repository, - E) - @@ expression E; @@ diff --git a/object-store.h b/object-store.h index bd2322ed8ce..53996018c11 100644 --- a/object-store.h +++ b/object-store.h @@ -312,10 +312,6 @@ int has_object(struct repository *r, const struct object_id *oid, * These functions can be removed once all callers have migrated to * has_object() and/or oid_object_info_extended(). */ -#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS -#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags) -#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1) -#endif int repo_has_object_file(struct repository *r, const struct object_id *oid); int repo_has_object_file_with_flags(struct repository *r, const struct object_id *oid, int flags); From patchwork Sat Mar 26 17:14:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12792642 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 066CEC433EF for ; Sat, 26 Mar 2022 17:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234215AbiCZRQX (ORCPT ); Sat, 26 Mar 2022 13:16:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232799AbiCZRQO (ORCPT ); Sat, 26 Mar 2022 13:16:14 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AA4435AA8 for ; Sat, 26 Mar 2022 10:14:37 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id u16so14683046wru.4 for ; Sat, 26 Mar 2022 10:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tokKn3kJoQhtfoKIy68C85T1SUOGLJ/PBvKnvlsBPwI=; b=l/EGxKk+4ycBOWboDEU5zp+tP750RRUGV97g4EcJpbqOJ06cIFlaJTIvDrP2Ne9iG+ g/hzzWGx0pnzf0CfU5LdLW9eqbdmtfb23GMIY4q6XvyB6Zn2nZw/w4kD96peJb4XJkcC cFzicTWDS11MJyejkkvmRmHup2/GO+t8eBnIQeIv+2OGiALJXgl73qZUcBvov7eFG2aA 47yPLNu8cpMmfJPOC83ytfQoa+ARUbD4DuxAF/nOP7eed8//duhCwAydiZZw6gYfBr2L JyiAj0n80dI22O5BcoSn0iQOe5RhPN5Jg1BsOAF91cvFMvgo8eCBCAiqsDULWFjaj43B Lfyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tokKn3kJoQhtfoKIy68C85T1SUOGLJ/PBvKnvlsBPwI=; b=3tcGMF2XzGTatljIzYyHEE2kcQLw96MclutsWXOotm3j7i7RVjW/j/rLMv5MZp80f6 8kAbt7/xMMHLgvJt7ADrSGvSJOBb+zqBwiPYd2JFz7F6/lLmiRrKv/2aoJO6579Rpb0M 9T92mVCZm+s34gVCBS2cC23MN463N4eHST+oFxhI0NgpxuEZQSiyJTHF5uZYx3odGDN/ e5VxDcBjZOSU8p0bN97ZsTGmniNafxW6RsXmeqviRodJ2qtMgFx3//Gqjbn0mPD5P9G1 PEI5ZuULStFqdM4OAzIskDEs0ev7goWrQlqkQsPWvzO1WcGLDdFdHrR7fda7Yyf+DDDp Kc0A== X-Gm-Message-State: AOAM532zJVcsM0WBc8q7H2FKg6Qkqbf75q+POIufI7QQVMevbMPFoxvx iyV2bPwQDNeABJphSc6Ca5O4ppbfrZOMFg== X-Google-Smtp-Source: ABdhPJxj7qeHrvmBw/yPlZlWfuxm5mk/Cy8vcn7eAtN3sUeJLeDRHsXp1P0uFJRVOimajuoGu6ayBQ== X-Received: by 2002:adf:f4c7:0:b0:203:fb33:332f with SMTP id h7-20020adff4c7000000b00203fb33332fmr13821389wrp.280.1648314875306; Sat, 26 Mar 2022 10:14:35 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c4f1300b0038cb924c3d7sm7805913wmq.45.2022.03.26.10.14.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 10:14:34 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 6/7] alloc.[ch]: remove alloc_report() function Date: Sat, 26 Mar 2022 18:14:18 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1535.gf8d72b9da1e In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The alloc_report() function has been orphaned since its introduction in 855419f764a (Add specialized object allocator, 2006-06-19), it appears to have been used for demonstration purposes in that commit message. These might be handy to manually use in a debugger, but keeping them and the "count" member of "alloc_state" just for that doesn't seem worth it. Signed-off-by: Ævar Arnfjörð Bjarmason --- alloc.c | 21 --------------------- alloc.h | 1 - 2 files changed, 22 deletions(-) diff --git a/alloc.c b/alloc.c index 957a0af3626..27f697e4c87 100644 --- a/alloc.c +++ b/alloc.c @@ -27,7 +27,6 @@ union any_object { }; struct alloc_state { - int count; /* total number of nodes allocated */ int nr; /* number of nodes left in current allocation */ void *p; /* first free node in current allocation */ @@ -63,7 +62,6 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size) s->slabs[s->slab_nr++] = s->p; } s->nr--; - s->count++; ret = s->p; s->p = (char *)s->p + node_size; memset(ret, 0, node_size); @@ -122,22 +120,3 @@ void *alloc_commit_node(struct repository *r) init_commit_node(c); return c; } - -static void report(const char *name, unsigned int count, size_t size) -{ - fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n", - name, count, (uintmax_t) size); -} - -#define REPORT(name, type) \ - report(#name, r->parsed_objects->name##_state->count, \ - r->parsed_objects->name##_state->count * sizeof(type) >> 10) - -void alloc_report(struct repository *r) -{ - REPORT(blob, struct blob); - REPORT(tree, struct tree); - REPORT(commit, struct commit); - REPORT(tag, struct tag); - REPORT(object, union any_object); -} diff --git a/alloc.h b/alloc.h index 371d388b552..3f4a0ad310a 100644 --- a/alloc.h +++ b/alloc.h @@ -13,7 +13,6 @@ void init_commit_node(struct commit *c); void *alloc_commit_node(struct repository *r); void *alloc_tag_node(struct repository *r); void *alloc_object_node(struct repository *r); -void alloc_report(struct repository *r); struct alloc_state *allocate_alloc_state(void); void clear_alloc_state(struct alloc_state *s); From patchwork Sat Mar 26 17:14:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12792644 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05DC9C433F5 for ; Sat, 26 Mar 2022 17:14:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234327AbiCZRQY (ORCPT ); Sat, 26 Mar 2022 13:16:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232824AbiCZRQP (ORCPT ); Sat, 26 Mar 2022 13:16:15 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1DEE3524D for ; Sat, 26 Mar 2022 10:14:37 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id r7so13561685wrc.0 for ; Sat, 26 Mar 2022 10:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fx7mvYY650ic7EUc/Vbj5qeuJT73d8MUrpi/ypj/+pk=; b=H9xweYcDUofvUhmTPeHU7e6mUu/s+JzDXPTwQpRy3i/JDwbAtfSRrlu7jqDuNL4yPi 51y65dBhA37zbrKXvdM3K5svAldqKWTsvpXSpb2Bg4wIBDcMo5uXmmYY4lQyslpW5FKg rCQUctEFxRwMggiax8+0ek/B3S5CmJgMrx+S6Xy7J9gBSVBJr9G9okaRPWgq4fX7bOth tk/4Qv7H4CPTBQtDfg8KSFKNR7GUp/6WN6rEQIknW31968QdTv7rDW/+Wty7ViR6nZIH xwRneg6MpK4tfl9OPntzbMyBJxLq+gOlhtE7yju7VjDYoYnMKD8lZ8RDkkGDfUTWSQcy cCTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fx7mvYY650ic7EUc/Vbj5qeuJT73d8MUrpi/ypj/+pk=; b=bLqkSkMeNJ5cVAt1NAFdWk07CHACNgfqXrnPtOwbpwVmsSrB+47kulF5HamLH6tOHS +mTB3jgwNSZa7dWU+byU008TATmRm2t5rvbwG/8u7p5fgFBplYILfvOcq1hKWPUkExLW psa/BgW/dOHckenXbw3zVKzA/o7d9tM6v8yjrCRbpam8hLtShx0ReYhB6KC0tpyFSFlB 9UW8nGlEODVLahLQHZVkzBqiweLlU9DOoIwtVD3mtFsnHlQH7PidsWlaa6DjA3v/oFwf 2yQuWWTehRH8NGIy2gCDHKtGj8YT8QUnt5UQ3XNfCcM21q3PgNr+2zzKGQSPJmusQFRx zmZA== X-Gm-Message-State: AOAM5308+TLPalkO1ArkLzDBiS2ObumnEJqlZewflkhK7eYr5XU0BwHb 0jIBnwNlrO3qFedh/DCY/MimutkfieeGFw== X-Google-Smtp-Source: ABdhPJzfHgxPCydLNQcmj4pBHG86/p+mxCMkpMAfyOa8syvAxne33XSx9b24fmOFAe4YBBHE2UnoxA== X-Received: by 2002:a5d:404c:0:b0:203:ea4e:3c07 with SMTP id w12-20020a5d404c000000b00203ea4e3c07mr14040994wrp.597.1648314876202; Sat, 26 Mar 2022 10:14:36 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c4f1300b0038cb924c3d7sm7805913wmq.45.2022.03.26.10.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 10:14:35 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n Date: Sat, 26 Mar 2022 18:14:19 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1535.gf8d72b9da1e In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Partially revert d323c6b6410 (i18n: git-sh-setup.sh: mark strings for translation, 2016-06-17). These strings are no longer used in-tree, and we shouldn't be wasting translator time on them for the benefit of a hypothetical out-of-tree user of git-sh-setup.sh. Since d03ebd411c6 (rebase: remove the rebase.useBuiltin setting, 2019-03-18) we've had no in-tree user of require_work_tree_exists(), and since the more recent c1e10b2dce2 (git-sh-setup: remove messaging supporting --preserve-merges, 2021-10-21) the only in-tree user of require_clean_work_tree() is git-filter-branch.sh. Let's only translate the message it uses, and revert the others to the pre-image of d323c6b6410. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-sh-setup.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index d92df37e992..1abceaac8d3 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -187,8 +187,7 @@ cd_to_toplevel () { require_work_tree_exists () { if test "z$(git rev-parse --is-bare-repository)" != zfalse then - program_name=$0 - die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")" + die "fatal: $0 cannot be used without a working tree." fi } @@ -206,13 +205,13 @@ require_clean_work_tree () { if ! git diff-files --quiet --ignore-submodules then - action=$1 - case "$action" in + case "$1" in "rewrite branches") gettextln "Cannot rewrite branches: You have unstaged changes." >&2 ;; *) - eval_gettextln "Cannot \$action: You have unstaged changes." >&2 + # Some out-of-tree user of require_clean_work_tree() + echo "Cannot $1: You have unstaged changes." >&2 ;; esac err=1 @@ -222,8 +221,15 @@ require_clean_work_tree () { then if test $err = 0 then - action=$1 - eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2 + case "$1" in + "rewrite branches") + gettextln "Cannot rewrite branches: You have unstaged changes." >&2 + ;; + *) + # Some out-of-tree user of require_clean_work_tree() + echo "Cannot $1: Your index contains uncommitted changes." >&2 + ;; + esac else gettextln "Additionally, your index contains uncommitted changes." >&2 fi