From patchwork Tue Mar 16 00:56:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 12140879 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37979C43381 for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08BAD64F73 for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233972AbhCPA4r (ORCPT ); Mon, 15 Mar 2021 20:56:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234030AbhCPA4b (ORCPT ); Mon, 15 Mar 2021 20:56:31 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38819C06174A for ; Mon, 15 Mar 2021 17:56:31 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id y67so7697399pfb.2 for ; Mon, 15 Mar 2021 17:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kRzqgxRED+G3WH3sstIxjkw2+KTh6NNCbSMG3GK3J/k=; b=tCgiCbDqkFYn8GCJbxEbprA3+pCXzavmsgk/yAuALfp0go53AWji2K4U9YH6L5IBjh LjVKQ7JZvV4QlS/KbdhkHsBP+SV41y/S0jbE/Uv9z72hIKSgX5ax5LgXzmNKolYB0EtM mgcXBO/UZaOPmEwfxaHce8SyAjExjVUK3pOyLO6NoF/c6oQCDelVshdbZJVOQGYXQymi Ea03Ajsk1rnY/ABpU0IwYJ7dDgryMQSGaohDxukmWemiLCiToNKHtQ5D0GL5jPWjWf9M lkDLg5W1hYSXxusSnOBa+Hk3rKpRBq7BjOmMxSGmqE6U+oDXC+4BU8ZHkDhlpo4KGqnX 4NPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kRzqgxRED+G3WH3sstIxjkw2+KTh6NNCbSMG3GK3J/k=; b=qgbYhNmYgr8h4P/j+a6mPVTC3aHQOKfQesS75pYnpikIenDEiDfi6Mr15KfKmlqlXB 9r5aKFX3UkLwxnAW5w7BG4Pjwa4FM6LEOelmhiCizswDAXO/qk1wg3AClkBOq2/ZhXj0 gHCNs5HFJeZdGraMlB3XWPnEeNRlNUZb/SkJG4NspVsvIwraK3AdJtwAVGAhMZw3UKPb 8F2KuIRoZv9wUPVwzAnrpFPHKca/LHWgttWyOmTN2M50Zc3lzyF/OthpkhA5YrpMVOSC +8rjqruPIKa6nU7LNm9LhTv/RspVDCsZ+JWiCjuqJ0tqRyXEzkWLgRgNk+ZnYaCqjvZB pAZA== X-Gm-Message-State: AOAM533TwBdN7PxRQ8u0swbDuxQ/yvLCp+XX5XLy6rKTbHTsSbs7kSaB qP/11GPHo9zr3437S6V/4l8Tw+IEKBg= X-Google-Smtp-Source: ABdhPJzIpqynDJIrKXu4DJehxLClhv2CFiKaHG9gEVP5ZdM8yq/1OAgcKft1PN4runBaKILH+Sy3Qw== X-Received: by 2002:a62:7556:0:b029:1ff:5bf8:72b3 with SMTP id q83-20020a6275560000b02901ff5bf872b3mr12723663pfc.33.1615856190625; Mon, 15 Mar 2021 17:56:30 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h186sm14670312pgc.38.2021.03.15.17.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 17:56:30 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Johannes Schindelin , Junio C Hamano Subject: [PATCH 1/7] Makefile: mark 'check-builtins' as a .PHONY target Date: Mon, 15 Mar 2021 17:56:20 -0700 Message-Id: X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Then convention in Git's Makefile is to mark targets which do not actually generate any precious files (such as static checking targets). .PHONY enables the target to still run, even if a file is erroneously created with the same name as the target. Mark 'check-builtins' as a .PHONY target. Signed-off-by: Denton Liu --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index dfb0f1000f..6dbecdb606 100644 --- a/Makefile +++ b/Makefile @@ -3236,6 +3236,7 @@ check-docs:: ### Make sure built-ins do not have dups and listed in git.c # +.PHONY: check-builtins check-builtins:: ./check-builtins.sh From patchwork Tue Mar 16 00:56:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 12140877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 285B5C433E6 for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E743864F70 for ; Tue, 16 Mar 2021 00:57:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234055AbhCPA4s (ORCPT ); Mon, 15 Mar 2021 20:56:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234037AbhCPA4c (ORCPT ); Mon, 15 Mar 2021 20:56:32 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22A1DC06174A for ; Mon, 15 Mar 2021 17:56:32 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id x29so21498421pgk.6 for ; Mon, 15 Mar 2021 17:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BchThtV8YRognHERkN/0fie3Yzw7/Zd8VpSB+ipofPo=; b=nVIriQl2VXr1AH6vJimhtxfgTT5hROf3mR47vgAob23cGjMIlsobJtGb6kcL2om93i aq7cShoBx+ZI/ow6phNLve3c1oaJmGiTB43LiXhAXSDwchem1ytwrslHU/rYXmYQSHH1 C9zRtAtheLOVGgQP40sJg0qPK9CQIFq/2xg52r+Bv9pMq58/8+vSo+oy6e2kqq11rwdS T6M24W9WAf7FJM6HGYB3Nrhj1jnflalCptsgenLp50eiOXEeZxuHZuocePKwRkUw6uMJ W5DrT/aRekh0bVsLbuKa8kELySHs6rdhBoSusokNjQr+kz7WZegjNRuY1vM5V/7/fw6z QHeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BchThtV8YRognHERkN/0fie3Yzw7/Zd8VpSB+ipofPo=; b=ATwfY1jbc3Q6yqFBfme3+x0fLMNed2TryGSy+7LleNcUqOOPqinQKQrN1G2OGwcTf9 7IUj8845Ss/XrpS+gXRlQH4ZmxEo9RliMdoJzM960t9cUB4iJON0EIr021rwty9eGeuf AGjEO4mmB43J4nFQYCRCLXsG2+22PXoEqzyz6o+ijjm+k2tnFGP7HIi+0atIQjkGDlKX r98I7/kcKvRZyvK3DmOpzcX1PMwXpfCuz5vGrb/Ny2aA/oH5TIvRS9Pye0gni2opjWOb 1VywI38X0Dpm9MCMKRvFBuljSZzFj3pkl5pjpcMbxGdtZPlpxncVzwtKJHjiavhKkUck HfeQ== X-Gm-Message-State: AOAM530q5Wg3Ma3Qqvx1F0J9poF2jAQMQWV0B3yoTUy2gpjAsFDOGdn9 Sr6ZNPrPhitVX8ucCy8rPe7DFkxYw4g= X-Google-Smtp-Source: ABdhPJweTMiK+qQ4EEMg1647SsGgR87UDOx57iKpPXMGdP2qcQRSm7CD+UC8Z8Xznkgk8tcwbjx2AQ== X-Received: by 2002:a05:6a00:b45:b029:207:16ba:12c4 with SMTP id p5-20020a056a000b45b029020716ba12c4mr7563176pfo.31.1615856191476; Mon, 15 Mar 2021 17:56:31 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h186sm14670312pgc.38.2021.03.15.17.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 17:56:31 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Johannes Schindelin , Junio C Hamano Subject: [PATCH 2/7] Makefile: ASCII-sort LIB_OBJS Date: Mon, 15 Mar 2021 17:56:21 -0700 Message-Id: <1d31e6aee77d374b00696597cf727d6e0d494632.1615856156.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In 805d9eaf5e (Makefile: ASCII-sort += lists, 2020-03-21), the += lists in the Makefile were sorted into ASCII order. Since then, more out of order elements have been introduced. Sort these lists back into ASCII order. This patch is best viewed with `--color-moved`. Signed-off-by: Denton Liu --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6dbecdb606..5832aa33da 100644 --- a/Makefile +++ b/Makefile @@ -858,8 +858,8 @@ LIB_OBJS += date.o LIB_OBJS += decorate.o LIB_OBJS += delta-islands.o LIB_OBJS += diff-delta.o -LIB_OBJS += diff-merges.o LIB_OBJS += diff-lib.o +LIB_OBJS += diff-merges.o LIB_OBJS += diff-no-index.o LIB_OBJS += diff.o LIB_OBJS += diffcore-break.o @@ -910,8 +910,8 @@ LIB_OBJS += mailmap.o LIB_OBJS += match-trees.o LIB_OBJS += mem-pool.o LIB_OBJS += merge-blobs.o -LIB_OBJS += merge-ort.o LIB_OBJS += merge-ort-wrappers.o +LIB_OBJS += merge-ort.o LIB_OBJS += merge-recursive.o LIB_OBJS += merge.o LIB_OBJS += mergesort.o From patchwork Tue Mar 16 00:56:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 12140875 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B741C433DB for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5A3864F04 for ; Tue, 16 Mar 2021 00:57:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234061AbhCPA4s (ORCPT ); Mon, 15 Mar 2021 20:56:48 -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 S234041AbhCPA4d (ORCPT ); Mon, 15 Mar 2021 20:56:33 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DE4FC06174A for ; Mon, 15 Mar 2021 17:56:33 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id 205so4526696pgh.9 for ; Mon, 15 Mar 2021 17:56:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2iQLI0PQ/J2j6ySE0fTaxcD8Dxt3YsQsADOTribANyc=; b=mzNhQmH4GsvpNERyyhSgv7741hUzgL1aeFkVncAPukv9ZqvxCaKF+w/U8TatBKqUmK 49tHpR6e1LuLkO/CqbcS3HEqqKPG6+pLZ3gf2C2zMXdCCVlMxkQtc0QsYSdTWK2fm8zn tvTLBxLqCryylie2c+Fi/a6KgCyKlYDglqKJ51IjAahVvN/N5CXnhnsie+7fi0JcoAX/ qeyi364pvf5H+jzQFXVuElqWxdN+Fr/P1q1PRE81fIJcP45pvpOJMFCcLDEd8FPRKSOB 6R7/F3Xy0HOFsc1jrx6rRsKJaAnOo3cFaLVq2lBMW5kOtBjBKaYffduRRkl1d708mq6y 9XRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2iQLI0PQ/J2j6ySE0fTaxcD8Dxt3YsQsADOTribANyc=; b=QhRRYCo59GRwVghgVTC4me08jcktFzjUYgQSCcac2+0MMym5tWbC6yr7eeXZTORjK3 NySdaNxjVJCWcEVJ2WHpDr23Du04ME3gbt6L3NgSWbz5KeJPdHt+BWUVs7jmYAjKL3zn iubaCoxyKleeqyKHy//7LAxwQpztlkoJOnVW/pZkYxXWbmtTgeVlR5MLy33O9daVeuuk OfGgOiVRMacxCa+1RYp4b35mGnzv+/YaUpPjPKHp068PukZaMRXnQyJBuEcggIDca4y/ cv70F/MpEQNYmhIbM+/a/GZSo+bzpXlQ0/WTm8xerkFWU/TBUUK8RN216FP2HByuSBDM XjNA== X-Gm-Message-State: AOAM532rInvV9iWtPez8tohPEMKf+4+/dnzZGbfEE9/LaTxqebSiPPq6 IMQgCGwDLHDdqclptdZ4SPK93u2jBbY= X-Google-Smtp-Source: ABdhPJwJVzMfV8JNGYhRUpOIXF7w7+AvCc4aikVzi+7HzHbEdzqQXUIaUDLpSztqzDav0JyTShfxfg== X-Received: by 2002:a63:4c5e:: with SMTP id m30mr1578192pgl.402.1615856192372; Mon, 15 Mar 2021 17:56:32 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h186sm14670312pgc.38.2021.03.15.17.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 17:56:32 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Johannes Schindelin , Junio C Hamano Subject: [PATCH 3/7] builtin.h: ASCII-sort list of functions Date: Mon, 15 Mar 2021 17:56:22 -0700 Message-Id: X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The list of builtin functions have, over time, gotten slightly out of ASCII order. Sort this list to bring them back into order. ASCII sorting was chosen over strict alphabetical order for the same reason as 805d9eaf5e (Makefile: ASCII-sort += lists, 2020-03-21): the purpose of maintaining the sorted list is to ensure line insertions are deterministic. By using ASCII ordering, it is more easily mechanically reproducible in the future, such as by using :sort in Vim. This patch is best viewed with `--color-moved`. Signed-off-by: Denton Liu --- builtin.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin.h b/builtin.h index b6ce981b73..dd6beff6b2 100644 --- a/builtin.h +++ b/builtin.h @@ -122,16 +122,16 @@ int cmd_branch(int argc, const char **argv, const char *prefix); int cmd_bugreport(int argc, const char **argv, const char *prefix); int cmd_bundle(int argc, const char **argv, const char *prefix); int cmd_cat_file(int argc, const char **argv, const char *prefix); -int cmd_checkout(int argc, const char **argv, const char *prefix); -int cmd_checkout_index(int argc, const char **argv, const char *prefix); int cmd_check_attr(int argc, const char **argv, const char *prefix); int cmd_check_ignore(int argc, const char **argv, const char *prefix); int cmd_check_mailmap(int argc, const char **argv, const char *prefix); int cmd_check_ref_format(int argc, const char **argv, const char *prefix); +int cmd_checkout(int argc, const char **argv, const char *prefix); +int cmd_checkout_index(int argc, const char **argv, const char *prefix); int cmd_cherry(int argc, const char **argv, const char *prefix); int cmd_cherry_pick(int argc, const char **argv, const char *prefix); -int cmd_clone(int argc, const char **argv, const char *prefix); int cmd_clean(int argc, const char **argv, const char *prefix); +int cmd_clone(int argc, const char **argv, const char *prefix); int cmd_column(int argc, const char **argv, const char *prefix); int cmd_commit(int argc, const char **argv, const char *prefix); int cmd_commit_graph(int argc, const char **argv, const char *prefix); @@ -143,9 +143,9 @@ int cmd_credential_cache(int argc, const char **argv, const char *prefix); int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix); int cmd_credential_store(int argc, const char **argv, const char *prefix); int cmd_describe(int argc, const char **argv, const char *prefix); +int cmd_diff(int argc, const char **argv, const char *prefix); int cmd_diff_files(int argc, const char **argv, const char *prefix); int cmd_diff_index(int argc, const char **argv, const char *prefix); -int cmd_diff(int argc, const char **argv, const char *prefix); int cmd_diff_tree(int argc, const char **argv, const char *prefix); int cmd_difftool(int argc, const char **argv, const char *prefix); int cmd_env__helper(int argc, const char **argv, const char *prefix); @@ -169,16 +169,16 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix); int cmd_log(int argc, const char **argv, const char *prefix); int cmd_log_reflog(int argc, const char **argv, const char *prefix); int cmd_ls_files(int argc, const char **argv, const char *prefix); -int cmd_ls_tree(int argc, const char **argv, const char *prefix); int cmd_ls_remote(int argc, const char **argv, const char *prefix); +int cmd_ls_tree(int argc, const char **argv, const char *prefix); int cmd_mailinfo(int argc, const char **argv, const char *prefix); int cmd_mailsplit(int argc, const char **argv, const char *prefix); int cmd_maintenance(int argc, const char **argv, const char *prefix); int cmd_merge(int argc, const char **argv, const char *prefix); int cmd_merge_base(int argc, const char **argv, const char *prefix); +int cmd_merge_file(int argc, const char **argv, const char *prefix); int cmd_merge_index(int argc, const char **argv, const char *prefix); int cmd_merge_ours(int argc, const char **argv, const char *prefix); -int cmd_merge_file(int argc, const char **argv, const char *prefix); int cmd_merge_recursive(int argc, const char **argv, const char *prefix); int cmd_merge_tree(int argc, const char **argv, const char *prefix); int cmd_mktag(int argc, const char **argv, const char *prefix); @@ -189,6 +189,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix); int cmd_notes(int argc, const char **argv, const char *prefix); int cmd_pack_objects(int argc, const char **argv, const char *prefix); int cmd_pack_redundant(int argc, const char **argv, const char *prefix); +int cmd_pack_refs(int argc, const char **argv, const char *prefix); int cmd_patch_id(int argc, const char **argv, const char *prefix); int cmd_prune(int argc, const char **argv, const char *prefix); int cmd_prune_packed(int argc, const char **argv, const char *prefix); @@ -204,6 +205,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix); int cmd_remote_ext(int argc, const char **argv, const char *prefix); int cmd_remote_fd(int argc, const char **argv, const char *prefix); int cmd_repack(int argc, const char **argv, const char *prefix); +int cmd_replace(int argc, const char **argv, const char *prefix); int cmd_rerere(int argc, const char **argv, const char *prefix); int cmd_reset(int argc, const char **argv, const char *prefix); int cmd_restore(int argc, const char **argv, const char *prefix); @@ -216,9 +218,10 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix); int cmd_show(int argc, const char **argv, const char *prefix); int cmd_show_branch(int argc, const char **argv, const char *prefix); int cmd_show_index(int argc, const char **argv, const char *prefix); +int cmd_show_ref(int argc, const char **argv, const char *prefix); int cmd_sparse_checkout(int argc, const char **argv, const char *prefix); -int cmd_status(int argc, const char **argv, const char *prefix); int cmd_stash(int argc, const char **argv, const char *prefix); +int cmd_status(int argc, const char **argv, const char *prefix); int cmd_stripspace(int argc, const char **argv, const char *prefix); int cmd_submodule__helper(int argc, const char **argv, const char *prefix); int cmd_switch(int argc, const char **argv, const char *prefix); @@ -235,14 +238,11 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix); int cmd_upload_pack(int argc, const char **argv, const char *prefix); int cmd_var(int argc, const char **argv, const char *prefix); int cmd_verify_commit(int argc, const char **argv, const char *prefix); +int cmd_verify_pack(int argc, const char **argv, const char *prefix); int cmd_verify_tag(int argc, const char **argv, const char *prefix); int cmd_version(int argc, const char **argv, const char *prefix); int cmd_whatchanged(int argc, const char **argv, const char *prefix); int cmd_worktree(int argc, const char **argv, const char *prefix); int cmd_write_tree(int argc, const char **argv, const char *prefix); -int cmd_verify_pack(int argc, const char **argv, const char *prefix); -int cmd_show_ref(int argc, const char **argv, const char *prefix); -int cmd_pack_refs(int argc, const char **argv, const char *prefix); -int cmd_replace(int argc, const char **argv, const char *prefix); #endif From patchwork Tue Mar 16 00:56:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 12140885 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88A22C4332B for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63FAA64F7F for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234066AbhCPA4s (ORCPT ); Mon, 15 Mar 2021 20:56:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234045AbhCPA4e (ORCPT ); Mon, 15 Mar 2021 20:56:34 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F32B5C06174A for ; Mon, 15 Mar 2021 17:56:33 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id 18so7691749pfo.6 for ; Mon, 15 Mar 2021 17:56:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sEvvhoZQRkWT8560p3ZLxqNb7GqmbHEp+hd7wLHwOIM=; b=g6Ltig3hyar5kze2Wu+2ZJV6NZ7LnaxwfzImN4BeKq1RVpR26PIFWOA9eD/5OInDWx fnXSGynTXMsRQe57iuMZHndKqOjQ99LhFwrvzW0YYjgdoF1UAmnWYXOcdKtFZDi8Fqjn gcOi+dFG67b1y/wtPd588FZ7tEb5/okBQq5YbH6Ex6awgjsjBhmLIoCnUlMMpp7eZ8S7 nreiyIwDinbqfFnVlklbgDQ3HTWr40SXD7m1QZgZ5tYuPhp0yKPXOzYm4PPxeHLarfVc 0O1r7es5TbqbDqb5CczQkZlnyD0qzYjVlm3IAlQIYPR3p+Dm/2mwxvn4P4Zj78S6jtkh qQOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sEvvhoZQRkWT8560p3ZLxqNb7GqmbHEp+hd7wLHwOIM=; b=G3X6pukQiJ2TcXv/0EKH3LH7DY1iw1xHMRkGc7vSIA7eyaFCCPL59sR+GAfm4RtorT 2RQ1r3UMTh55cUajurGZdCUk9SiwzaZXJ4BA01kbghCwFxYnVf20B7FVrHAeX/fIPchA EZ2wwujoxORSth+tLp4FIbTaNEd0FBWshXB7gr/xtRNeQ0zV95n+wZVKKAjBN0gIFcul htp2C9i7w3lCAB/DIHtvylrTj2D0B2aEEKnZMkGaa2lnAzEgp6La2OxnGxT8Qci9KfGl absSCi4xwEQrF5aQrJX7/MEV5Q/9y/7rJ4oZ+/fpGzv2Rw0Aix8CQs6Xhytt4zp8wtV3 yBtA== X-Gm-Message-State: AOAM530HiJyjwJ7xMZGKfr1AHh+PJksJbbxA3xNZb7n50rN48npNlkya qWBpGEZvw3FU8uExm3+mMJAZgIgHkQ4= X-Google-Smtp-Source: ABdhPJy58LMExbT3fDmGPXxc56zk3imxt9NSGIV4MqLmbOz6/0iK92JHgUJ/B5WiJKMpG4Cs0gPM2w== X-Received: by 2002:a65:4085:: with SMTP id t5mr1568689pgp.208.1615856193334; Mon, 15 Mar 2021 17:56:33 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h186sm14670312pgc.38.2021.03.15.17.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 17:56:33 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Johannes Schindelin , Junio C Hamano Subject: [PATCH 4/7] test-tool.h: ASCII-sort list of functions Date: Mon, 15 Mar 2021 17:56:23 -0700 Message-Id: X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The list of test-tool functions have, over time, gotten slightly out of ASCII order. Sort this list to bring them back into order. ASCII sorting was chosen over strict alphabetical order for the same reason as 805d9eaf5e (Makefile: ASCII-sort += lists, 2020-03-21): the purpose of maintaining the sorted list is to ensure line insertions are deterministic. By using ASCII ordering, it is more easily mechanically reproducible in the future, such as by using :sort in Vim. This patch is best viewed with `--color-moved`. Signed-off-by: Denton Liu --- t/helper/test-tool.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h index 28072c0ad5..9856e84149 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -22,14 +22,15 @@ int cmd__example_decorate(int argc, const char **argv); int cmd__fast_rebase(int argc, const char **argv); int cmd__genrandom(int argc, const char **argv); int cmd__genzeros(int argc, const char **argv); -int cmd__hashmap(int argc, const char **argv); int cmd__hash_speed(int argc, const char **argv); +int cmd__hashmap(int argc, const char **argv); int cmd__index_version(int argc, const char **argv); int cmd__json_writer(int argc, const char **argv); int cmd__lazy_init_name_hash(int argc, const char **argv); int cmd__match_trees(int argc, const char **argv); int cmd__mergesort(int argc, const char **argv); int cmd__mktemp(int argc, const char **argv); +int cmd__oid_array(int argc, const char **argv); int cmd__oidmap(int argc, const char **argv); int cmd__online_cpus(int argc, const char **argv); int cmd__parse_options(int argc, const char **argv); @@ -52,7 +53,6 @@ int cmd__run_command(int argc, const char **argv); int cmd__scrap_cache_tree(int argc, const char **argv); int cmd__serve_v2(int argc, const char **argv); int cmd__sha1(int argc, const char **argv); -int cmd__oid_array(int argc, const char **argv); int cmd__sha256(int argc, const char **argv); int cmd__sigchain(int argc, const char **argv); int cmd__strcmp_offset(int argc, const char **argv); @@ -62,8 +62,8 @@ int cmd__submodule_nested_repo_config(int argc, const char **argv); int cmd__subprocess(int argc, const char **argv); int cmd__trace2(int argc, const char **argv); int cmd__urlmatch_normalization(int argc, const char **argv); -int cmd__xml_encode(int argc, const char **argv); int cmd__wildmatch(int argc, const char **argv); +int cmd__xml_encode(int argc, const char **argv); #ifdef GIT_WINDOWS_NATIVE int cmd__windows_named_pipe(int argc, const char **argv); #endif From patchwork Tue Mar 16 00:56:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 12140881 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60686C433E9 for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BA8864F76 for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234078AbhCPA4t (ORCPT ); Mon, 15 Mar 2021 20:56:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234051AbhCPA4e (ORCPT ); Mon, 15 Mar 2021 20:56:34 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D48F8C06174A for ; Mon, 15 Mar 2021 17:56:34 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id r16so6365090pfh.10 for ; Mon, 15 Mar 2021 17:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aZVh/LIyKwf29/4alI+sUOnJx/pJ7PZzfHQMfW5ghbM=; b=T1ANssurX0NZj/QlplHbu9nfyGtIpQWlSPnqbzGvFK6m14ssFtb5clxD+F/fWzgb6J A0yCICgO6mglnYUMTpZO/b3DF+ADHnZLqW/trVJaHWDWTg/3/n8HnyojZaWoTEnutwEY 2qoYEmTVe++LhYnZxaW1o8HbLdcT9IW/r9gb4yFlHFOPcE5bBLgxR8pmdXhNS8nrjeyh x3t0XgSF8rKPyYisgix06eYekVUGoqad4XStfm4LWWqcJJJVaDqvJgUgoG7mvfS5OATj BqcGtS+hShPQb8X9ATnmLyHCJ9MThGib+un/I17mrPewqVXGedOfebyD2yvI0+ykFgSh Zhfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aZVh/LIyKwf29/4alI+sUOnJx/pJ7PZzfHQMfW5ghbM=; b=FuKk9CfLwOa8g4ijxQ0pn7I36HMsUuqL4P9htghmMdv01FVF0dUuqsvR3cb4dsAjeh UIUMg4wpr5/tMJmR6xF+oi8W37wiOvaoic6nK5vPSYsU1AkDgL0N07XAU5WUDWdsgshO ldXi872Qf+MUUXVLXwJmlTngoC++L8HkjkxHQUGCGRl8mrwFVg3YnrVbdtKC6PIDGLwk 1oy5/cYR8DAyFs5NXk2qKjuNAyTgh1VJwdORkP2YJAi9WBbOhqLFADQe1QcrgbwXkQm4 PHfN1kiPHMIvMUDSjJ++M3YLnSjfF9lpRnLPPomB6MSM82JuJYKiVovuCUn3AGXYUgeU mtqw== X-Gm-Message-State: AOAM531Pi21W2PVt4HR87XcP7IgTB8Y4wlynzMPcAUhuK7285YUhGq+P Dw4n9n2WPuz0nxp6qbQpqorKf2KiHvQ= X-Google-Smtp-Source: ABdhPJx1aFabrSlREvqKUXPR1yerCUF+qgJt86dHnj4lneo1qhWKJl9BpPDJS2vWcwdGjH8sydxGjQ== X-Received: by 2002:a62:8804:0:b029:20a:2125:2737 with SMTP id l4-20020a6288040000b029020a21252737mr3323563pfd.60.1615856194197; Mon, 15 Mar 2021 17:56:34 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h186sm14670312pgc.38.2021.03.15.17.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 17:56:33 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Johannes Schindelin , Junio C Hamano Subject: [PATCH 5/7] Makefile: add 'check-sort' target Date: Mon, 15 Mar 2021 17:56:24 -0700 Message-Id: <5088e93d76e44de9d079b7b2296b8c810828a2f5.1615856156.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In the previous few commits, we sorted many lists into ASCII-order. In order to ensure that they remain that way, add the 'check-sort' target. The check-sort.perl program ensures that consecutive lines that match the same regex are sorted in ASCII-order. The 'check-sort' target runs the check-sort.perl program on some files which are known to contain sorted lists. Signed-off-by: Denton Liu --- Notes: Full disclaimer: this is the first time I've written anything in Perl. Please let me know if I'm doing anything unconventional :) Makefile | 25 +++++++++++++++++++++++++ check-sort.perl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100755 check-sort.perl diff --git a/Makefile b/Makefile index 5832aa33da..b23dff384d 100644 --- a/Makefile +++ b/Makefile @@ -3240,6 +3240,31 @@ check-docs:: check-builtins:: ./check-builtins.sh +.PHONY: check-sort +check-sort:: + ./check-sort.perl \ + 'ALL_COMMANDS \+=' \ + 'ALL_COMMANDS_TO_INSTALL \+=' \ + 'BINDIR_PROGRAMS_NEED_X \+=' \ + 'BINDIR_PROGRAMS_NO_X \+=' \ + 'BUILTIN_OBJS \+=' \ + 'BUILT_INS \+=' \ + 'FUZZ_OBJS \+=' \ + 'GENERATED_H \+=' \ + 'LIB_OBJS \+=' \ + 'SCRIPT_LIB \+=' \ + 'SCRIPT_PERL \+=' \ + 'SCRIPT_PYTHON \+=' \ + 'SCRIPT_SH \+=' \ + 'TEST_BUILTINS_OBJS \+=' \ + 'TEST_PROGRAMS_NEED_X \+=' \ + 'THIRD_PARTY_SOURCES \+=' \ + 'XDIFF_OBJS \+=' \ + ) { + my $matched = 0; + chomp; + + for my $regex (@regexes) { + next unless $_ =~ $regex; + + if ($last_regex == $regex) { + die "duplicate lines: '$_'\n" unless $last_line ne $_; + die "unsorted lines: '$last_line' before '$_'\n" unless $last_line lt $_; + } + + $matched = 1; + $last_regex = $regex; + $last_line = $_; + } + + unless ($matched) { + $last_regex = 0; + $last_line = ''; + } +} From patchwork Tue Mar 16 00:56:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 12140883 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C5D8C4332D for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4567E64F72 for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234068AbhCPA4t (ORCPT ); Mon, 15 Mar 2021 20:56:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234052AbhCPA4f (ORCPT ); Mon, 15 Mar 2021 20:56:35 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9705C06174A for ; Mon, 15 Mar 2021 17:56:35 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id t37so10697857pga.11 for ; Mon, 15 Mar 2021 17:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3jFVKojXH4M1DsYGhOnDKWYDJNMqWGYlCNj1eQFij2o=; b=OobahH756zeenG0g1TrlG2IAHbu/m0Xw3I60mpooZwNvwHJgjDenR9fMLK0mtjesdJ 9zDsGglekC1NDJoEDVeaHG3vvUNiUakBZBJ/NnFdipIBswx7tdt07yZBukyNbE4/SY2i BJV6ZLnoN+ZhAk4ho6/vDFW11zeZK95EVjGGvFHqtPzxsFDrAtX+Q6ZtCGGY0DlIv8Ip UdM434BbF72GyRxXOWNYmNXh/u6XbwVfxwzgWji0yeB2gm7Re5uZyfYR1WjPto7rSVab /7Vla9jf66BsaGaTZKHkPxOQnM2FM9udNWCfYU49MJCYbvhd/+s7K+5jvqlvZpETTYcK HvtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3jFVKojXH4M1DsYGhOnDKWYDJNMqWGYlCNj1eQFij2o=; b=NRrdZbDMCRHycm6Pl8uXHeAeJ3tUEcefhr9PzF7glN7YHKGiJmweIfspWLrfkqLhFu SrVCI9T9d5htZ3AloNsikmN7SbCRnrPGj91X1QuasQ6ghwc+cr8d05wDACfUo7T2TZ3y fHe+kx47NkwJL1BWs1rA6vObRtqlQ9YaCJlP2eez1KZz9vJgKQ6BpfJLnj5je0jTSSTP VjzyJJINu8IhAp/KXk2px893SUSkegW623FuE/C8o/xCGnX2vxiDTdjirhu+jZp6EE16 9Oxgaznd2jCgr2mIU47+nbtn21KZweN1yJktbGIZYkp4cxIxOZPbN6kPfqNyEhG9mHbv SQjg== X-Gm-Message-State: AOAM532tcPJxjIpoo9gveTo+s5RJM77MvPMY8cm1oD+o58Wm2gdpy0hN tooi6Egu9RNCArAJWhRIiOr/Cs75+v4= X-Google-Smtp-Source: ABdhPJywYsX3oufDt9/YlaE0CMJA8ypaI0TzH8wrpcx3W9WPrbgfoyj7f+2MGXdCQQ2siTTHPEUxkg== X-Received: by 2002:a63:d58:: with SMTP id 24mr1497534pgn.171.1615856195075; Mon, 15 Mar 2021 17:56:35 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h186sm14670312pgc.38.2021.03.15.17.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 17:56:34 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Johannes Schindelin , Junio C Hamano Subject: [PATCH 6/7] ci/run-static-analysis.sh: make check-builtins Date: Mon, 15 Mar 2021 17:56:25 -0700 Message-Id: <8696305c1efcea42a2227f8efaa7e1e73c71d32c.1615856156.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org To ensure that any newly introduced builtins are in git.c command list and that no duplicate script files exist, run the 'check-builtins' target as part of static-analysis. Signed-off-by: Denton Liu --- ci/run-static-analysis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh index 65bcebda41..1ae122fc70 100755 --- a/ci/run-static-analysis.sh +++ b/ci/run-static-analysis.sh @@ -26,7 +26,7 @@ then exit 1 fi -make hdr-check || +make hdr-check check-builtins || exit 1 save_good_tree From patchwork Tue Mar 16 00:56:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 12140887 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97C70C43331 for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C15064F72 for ; Tue, 16 Mar 2021 00:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234081AbhCPA4t (ORCPT ); Mon, 15 Mar 2021 20:56:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234053AbhCPA4g (ORCPT ); Mon, 15 Mar 2021 20:56:36 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88FC9C06174A for ; Mon, 15 Mar 2021 17:56:36 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id t37so10697877pga.11 for ; Mon, 15 Mar 2021 17:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rl6UGS6/fd//X5zLxmR7QzJOdstld3TQFF86qC9cwBc=; b=QMSYgDP7PMprcLU2U9AYXij/r6Z3vtA26Rbkot8EYI2ryW6Di7Qr2jB9wR6lEJdZUr UNMIYoPrbWzzZqUJlnXvUw9r/RDv5nE+i+BXukqK77SXTAmh1wwhYGE2ncSu5QRhs0rs xFOXPiiKopTKp1jZq9z1nfck0JusinQh3BHULTqk3vjBxQsvUd23mRMi9amuPmAxcMrw UyQeAmFsj8XRtzuX9Gx1rAOiL+ySCQsWtjxsgGzolAJ0t4z7koX4uZAKfP9iH1xdoa52 +8eXtpGNZLlFlOlSCI0Rree0HdeLA2v7XAV0vNXlaeXXX1e1aqLvLFun7aD1X5669rxy fLgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rl6UGS6/fd//X5zLxmR7QzJOdstld3TQFF86qC9cwBc=; b=SG5oLhTtWVMUdrOosp6sQ70DJ0Mk0O8OhKaD284vkT9nlDzitYPemcN9qf3kX0Y/q/ 1+u3GZ5LRTJbHT2e8w1RywtH86RPcXeFb/ZgS2qyMoQaGsQuGw4vRQfnGR7wrpmq60Dt fo2f2VNShBgklG4IabE1vVJPUpfCDyjNhUp2B0BFvWAUEVdMuOiKyFR1LhEBBJoLHPAh +1TjLn0rkJXhyj38Y55ybdTUirtwj79RXrom+dkA5cCNF8lAWrF0e49mw8/W4saBgaVP Mkxu5xChciTkEQt+P3qBotbTqRo61Nc1cT/+J/GofGr1H6a2IqE4+BEA2YMtWG3zQgPj 4qTQ== X-Gm-Message-State: AOAM530s+ylFIcRDRDt5x8+JXRhbxE4Q7b6TAmBBQX7jcnJ0HAzE7lLT kOpm4bjhdTf0Sm0R2JfNTMaVHx4Zxcw= X-Google-Smtp-Source: ABdhPJxFnnW+SSsI3P+3KAdgVM5U+GPM5dTdIZE05/i/xfDSJvmnj3iOCkKqbFaMdSwtgp893HoxMQ== X-Received: by 2002:a63:cd08:: with SMTP id i8mr1499980pgg.49.1615856195973; Mon, 15 Mar 2021 17:56:35 -0700 (PDT) Received: from archbookpro.localdomain ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id h186sm14670312pgc.38.2021.03.15.17.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 17:56:35 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Johannes Schindelin , Junio C Hamano Subject: [PATCH 7/7] ci/run-static-analysis.sh: make check-sort Date: Mon, 15 Mar 2021 17:56:26 -0700 Message-Id: <09c993a8f78d67bcff196c5b8173a8e5f6fd805b.1615856156.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org To ensure that lists in some files remain in sorted order, run the 'check-sort' target as part of static-analysis. Signed-off-by: Denton Liu --- ci/run-static-analysis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh index 1ae122fc70..92437c09df 100755 --- a/ci/run-static-analysis.sh +++ b/ci/run-static-analysis.sh @@ -26,7 +26,7 @@ then exit 1 fi -make hdr-check check-builtins || +make hdr-check check-builtins check-sort || exit 1 save_good_tree