From patchwork Tue Dec 12 03:00:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 81946 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ABD16385B512 for ; Tue, 12 Dec 2023 03:00:52 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 2A0FC3857734 for ; Tue, 12 Dec 2023 03:00:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2A0FC3857734 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2A0FC3857734 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702350038; cv=none; b=Wu7103jlUw7OpcYRcSacbcQxStQRX7ASluQhznlNjaSY7wgOF+15ioV4PKkEgEGlLrWy/OCDtoe4/v9b9cJm6PqofHRGOeSJWnEdk52puJbEWKVwPydK18Ncg+MfBaaZbGkEpcrwCOMuDC/cqzMSFUkeuwRLq2urQkk928H8i4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702350038; c=relaxed/simple; bh=Pyf/gvLQhbmx19PCiU8CNOK2CRhQb5hwztbcX1/4zj8=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=LWBou1/vv6yF1eGduRam+6I5IgFRVTxbRHtOFdjPtrq6SqgFVcn9LRbqb36CU95a3nDuh/0jvwQ7PUZmUmD2o0hwa902pwPNDN0ae3ZF3X7ppD8Erurr0Ub0QbMkOpF166LhBS/0mraR52e8s1sYfVGz4AR5d2+ZNtMij4v9FYo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702350036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGkAOd16SwVzF3U6T9opP4Dpt3c2+KH61MEOHDeLBRk=; b=LKVYc+ne606PV7qYpY1ITMUuB/UnQzV5Rg9bxA+eUtp7ov6WFm0uNsb8Z7wY0IImyVTzDK /6aChb7INBxj9lDB1e/bkhZRPeLuDbX0E800IQM2IrvriV//Sip6jBWxDtWNDbUcWWo+p/ EVlxxNyuTMIiD+DLEEX3/TxuTybdS7k= Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-119-iLin38vvM-6c5p8JH3FRJw-1; Mon, 11 Dec 2023 22:00:35 -0500 X-MC-Unique: iLin38vvM-6c5p8JH3FRJw-1 Received: by mail-oo1-f69.google.com with SMTP id 006d021491bc7-58dad14ab40so6313526eaf.1 for ; Mon, 11 Dec 2023 19:00:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702350034; x=1702954834; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sGkAOd16SwVzF3U6T9opP4Dpt3c2+KH61MEOHDeLBRk=; b=bOoWiGgLu7l/nY5Z5PVGsoODpPPBhiBWrgxlHWLjDYWkt6XCgedMCkAcfgjL+AIdFU Ebu71QmvAGnuqLd7tIaqiVkzG9gwL/nwAUxiKMpgr5dDX697fzEgKlTJbCtjMJD0Hrom CfznlUBCDWrSj4kLPXpRdXxKVvrF94DhLBgAUBtOtk2fn4qp6LZY2o53Tp9ufnYhwTg+ LitBVSiSuTTt+uKyNpaJyh0E8Vl9x31P0pr/yoBrFgmNbC8wjrVslsKnX0iHUOgumWqh 1958bfRQunKATH4RFYTbxqxmiaGPdjcUtBHv03ia/n8EDVI9rXWAitVoMQM9BNxoAtkW 4HoQ== X-Gm-Message-State: AOJu0YysQSmkGKt2PH6NqxYe1kwx6R/8tH1j5zXGW6TNocniobnvZntk f2JsZSAV133WudKLU6HnYRQSEzGprTYga4hxIZyOuLz9ufp7JcWl6JmcjB81BJ21YWXq+/XQ7Vc FO2+7VolIaYaO3bJuntW1mG1XcqWh/9b13OKel5uTSknSMgpMDzXtHwp2vQ0JGhAR/oJoeORmTw == X-Received: by 2002:a05:6358:5e11:b0:16d:fe33:4c63 with SMTP id q17-20020a0563585e1100b0016dfe334c63mr6889700rwn.24.1702350034134; Mon, 11 Dec 2023 19:00:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IG1x7KeL6dQVRg+NUscajJh854eXasZcBa2B3EOGUcS3xB1epQ3tA/7uPLVznPJJEVR2GrTyw== X-Received: by 2002:a05:6358:5e11:b0:16d:fe33:4c63 with SMTP id q17-20020a0563585e1100b0016dfe334c63mr6889680rwn.24.1702350033642; Mon, 11 Dec 2023 19:00:33 -0800 (PST) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id dg1-20020a056214084100b0067ed87e51edsm1129928qvb.36.2023.12.11.19.00.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 19:00:33 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [PATCH] contrib: add git gcc-style alias Date: Mon, 11 Dec 2023 22:00:31 -0500 Message-Id: <20231212030031.1023808-1-jason@redhat.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org OK for trunk? -- 8< -- I thought it could be easier to use check_GNU_style.py. With this alias, 'git gcc-style' will take a git revision as argument instead of a file, or check HEAD if no argument is given. contrib/ChangeLog: * gcc-git-customization.sh: Add git gcc-style alias. --- contrib/gcc-git-customization.sh | 5 +++++ 1 file changed, 5 insertions(+) base-commit: 074c6f15f7a28c620c756f18c2a310961de00539 diff --git a/contrib/gcc-git-customization.sh b/contrib/gcc-git-customization.sh index 2e173e859d7..54bd35ea1aa 100755 --- a/contrib/gcc-git-customization.sh +++ b/contrib/gcc-git-customization.sh @@ -30,6 +30,11 @@ git config alias.gcc-backport '!f() { "`git rev-parse --show-toplevel`/contrib/g git config alias.gcc-fix-changelog '!f() { "`git rev-parse --show-toplevel`/contrib/git-fix-changelog.py" $@; } ; f' git config alias.gcc-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/mklog.py" $@; } ; f' git config alias.gcc-commit-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/git-commit-mklog.py" "$@"; }; f' +git config alias.gcc-style '!f() { + check=`git rev-parse --show-toplevel`/contrib/check_GNU_style.py; + arg=; if [ $# -ge 1 ] && [ "$1" != "-f" ]; then arg="$1"; shift; + elif [ $# -eq 3 ]; then arg="$3"; set -- "$1" "$2"; fi + git show $arg | $check "$@" -; }; f' # Make diff on MD files use "(define" as a function marker. # Use this in conjunction with a .gitattributes file containing