From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4NpeMSIyb2ALPAEAgWs5BA (envelope-from ) for ; Thu, 08 Apr 2021 18:41:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id YIdHKyIyb2BKHwAA1q6Kng (envelope-from ) for ; Thu, 08 Apr 2021 16:41:06 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3DF14E31F for ; Thu, 8 Apr 2021 18:41:06 +0200 (CEST) Received: from localhost ([::1]:47850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUXiL-0001JQ-3B for larch@yhetil.org; Thu, 08 Apr 2021 12:41:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUXaY-0001Mj-68 for guix-patches@gnu.org; Thu, 08 Apr 2021 12:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUXaX-00022S-Vg for guix-patches@gnu.org; Thu, 08 Apr 2021 12:33:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUXaX-0001cO-SB for guix-patches@gnu.org; Thu, 08 Apr 2021 12:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47658] [PATCH] etc/committer: Use git plumbing instead of porcelain Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Apr 2021 16:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47658 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47658@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16178995466171 (code B ref -1); Thu, 08 Apr 2021 16:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Apr 2021 16:32:26 +0000 Received: from localhost ([127.0.0.1]:48080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUXZy-0001bS-7K for submit@debbugs.gnu.org; Thu, 08 Apr 2021 12:32:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:57774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUXZw-0001bK-2N for submit@debbugs.gnu.org; Thu, 08 Apr 2021 12:32:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUXZv-0000xE-3w for guix-patches@gnu.org; Thu, 08 Apr 2021 12:32:23 -0400 Received: from mail-mw2nam12olkn2056.outbound.protection.outlook.com ([40.92.23.56]:8256 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUXZl-0001Sq-EV for guix-patches@gnu.org; Thu, 08 Apr 2021 12:32:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lP9uTV+92nJO67yg7vpQMHJzJBvtgZrpnOpml4CfTka85STQTu/1YQLzc1CfCAz4SUZ9pQnTxL2ozkh/Ym8Xxt2nQ4BDGB7Lt/mK/tpdF1ptDboEwUwkoakASPootKSPCKZknKlgLCm6IlWbuEteWoSVJmo5A1M10zXVJn2+PEYTipD0H+r2O5zCQYFCHfz/Gg20B2gnQtzFJQ6MTWIhrE2G6i9sE40xEBBaUoml+rIl6/lzpBvG4BVdattnxyXgIOir93QWkEDcWBu/pw9SZ9MKtEAVD4AMpmk70ILt0uBzr4uX5tkMUJ6kvQ7JzzsmVbHJqUjCvUWIJMpvDO3UBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0QxAEU87FJQofYq7sbl7iiCYwRWeS9x1nTzV/PE8U2c=; b=lGYzaxm7xy2frwz4gAtAshWcXf1fIDZihvhClbXpi2gFTI5zbjh6CleAE+AMSq8xfn1YKvwzbab/KFjquIZj3q24k/B6qd0G2YkjjL/FF/rz0uNjvFFx8V3FdLYylIT77e0+3m8tRkq4iyb15SoarpadHSdoE5fc+GXYT3qDIGKqpwi1zrlZGCl8V/qbQmiv4vq14br2yy+jeG8KeOYogI6Xyc/3dP1jttBExYX49I/WgvzFbtXnlfXIuRZ7p1ZiHSYvdgwIfg6xeKUEkHmE9jLbirJiA8hw/nxmRFDAHq7vShcFaL28/rZv0ioNuUaRzw64IgQtVrZXthsTaKPtrg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0QxAEU87FJQofYq7sbl7iiCYwRWeS9x1nTzV/PE8U2c=; b=VT41qlxAgPdBdR6gT3LW+dRGNmKWtkbzYidv0iwiWAdlnj2jrMPWx0HSSbS35TdjmSiQ6E0m+KOntkqbbrGjHqvJ3jRgw4B6U+mkw4pwg0Lb9p9bCyFdjSvUDjn/btx3B5LjbF+BNh4UmomJN26BNkPLYZWRpjUoRRkHfJmS/E9z+3NKxlF8yi+hGdn+bqqCI1TnhjPiMEwODpDasoCCG31ARb9aCHPyGwrodd6DgvWj+ERij0f3kSDhl4ftfmfLyL9rGH/bo6cK4tCaPDqgBxTPQgPW1tIxmceQmdC0wHaiNJ/NlWUdB/jgZJyPIX6kTXANWBpXC3HWt/eKF13n4w== Received: from MW2NAM12FT060.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::45) by MW2NAM12HT158.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::316) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.8; Thu, 8 Apr 2021 16:17:05 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2a01:111:e400:fc65::4a) by MW2NAM12FT060.mail.protection.outlook.com (2a01:111:e400:fc65::323) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.6 via Frontend Transport; Thu, 8 Apr 2021 16:17:05 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:585CBF666806B5A6BB83DDADACA86DD59C74054DCFFB2EE92F4B29156F2AEFCE; UpperCasedChecksum:A6EE6CBC907C3EA8A0665E496E3D1F4B766EC4D526583F60A5653E8073360025; SizeAsReceived:7304; Count:45 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::b92f:829e:18e4:7ba9]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::b92f:829e:18e4:7ba9%2]) with mapi id 15.20.4020.016; Thu, 8 Apr 2021 16:17:05 +0000 From: Morgan.J.Smith@outlook.com Date: Thu, 8 Apr 2021 12:16:35 -0400 Message-ID: X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [vVaUmaZo1QPkUqetyNKYDMV2tc/HRJFn] X-ClientProxiedBy: YQBPR0101CA0080.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::13) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20210408161634.5879-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.hitronhub.home (170.52.80.149) by YQBPR0101CA0080.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32 via Frontend Transport; Thu, 8 Apr 2021 16:17:03 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c894bf24-72fb-4c87-24be-08d8faa9bf55 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUUcF99Xf9jcIXGW7k1i2KF2bb3AfKUxzdW0TRytoJ3Ob26cVgjOo+dniOiRxU3IPsEMFCEat81KxRUCE+rC6sebJVOvoA//Ny05TVBC2wveCaPA4uGt3shkbE5ntmfAFiL6Oj9WKHdb5lKwp2PQOLIUqPuxLBd8V2TT6IIOOXhr+RA3pndpnCEsdoacinzqQlDDitgSdLdhHcECZ02DNR6HVcv5gJFg2xNdhN81EkNW9JEWNrl3jCdPnTvqnro0kIWPZBgioKhHAAhArw4vcAWOlsw9yV51/i2zs67QMj/CfLlH0fLHNg4PaXsBdAOiJBMU3rWdgUNXkSP38zZcc6EuX4EvycobQyxKnzOYcETQdWOL7ZmmimxdJHmrk1+g4J+FCTxPqg/hoDRdOP34VlQZppw06Ocq+8bV6W1Mi0JhGqT5HaPHtOUCh0BBwzVxn/1BgQT6qbJ0FCpY8lxYNhBcUr2WPiRRIpNNvfbNtp1fXuRY8oXBWjBhdJHOWpd+yuqTySuNnV2sO8oloMKYYPHaUsQXWxCbFDwpWHeEJOKdGcuMr5BWmQXTF32FC542QdTrIr1w8U5HUdA224tyC4n8/xVP82lUsYK+emelEMCjw6vvOr9iV8Zt1JBq9IxDBx+5cz4FrfkqHkM2Mn8Yc1/Q2sImpuGHk81WXv4/KNFEDpt6xO3Va3rbbfV05UL/IyGwYZoMjl9xcmkHGRxHiFTd+aUn+GPtxc= X-MS-TrafficTypeDiagnostic: MW2NAM12HT158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ptdUDqqDbeqUiOJIpc5EYfHwYtK6sDaYWuF0HXN0bb1hY1EtjXPtKzYhnGwoniFV44qT+u2TdX1t2Y6X1W7qsPMIALkG4OO+3RxMTUl8wqWPGq/B1WcvwuLIvdQijzCMyWyH2ac1JFpOys5ox6RNrkGFraw+18wm7ziaUvn55MO2tyB2cuJhCoVBorzDu8JhZlNeP5usn28jkj5S6J0b0fTYL3GdkCC/1Xty/vH/xJxQzY1JACyc64MSaYJN3CxM+0fteFMFC4EoLDQ45uD3zeq7k+5ZlpT3bzHWjc12IEJLJ/M4r7Hk9abU7FZNhNPYt0QmUKmnJWwsd0iJ0l1mTad9tyAXqk6jC6nMDRTf1CspaODb9VFvfKfwHmOe+Wz0xEuVCOnc7GRbgdmz79eVZA== X-MS-Exchange-AntiSpam-MessageData: cnRX2LyuMbUX4i7j5nN4FZRqJ3F8Fjd9grmlumC0WgrakfwB5TKVfixF9pIPBenvZosMvQJu0jUEfYNc7WjF9KIGBTmd0+BUia/T57Fbtx4AqtJTH2O6pldnQTq52XTol4j69HpJZm5C5H2VnlcK3w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c894bf24-72fb-4c87-24be-08d8faa9bf55 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 16:17:05.4251 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: MW2NAM12FT060.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2NAM12HT158 Received-SPF: pass client-ip=40.92.23.56; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617900066; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=0QxAEU87FJQofYq7sbl7iiCYwRWeS9x1nTzV/PE8U2c=; b=dbCEOwhNo6g+nbjjv89y6UbKmxVMUu0VMB3UjgDTyIAgw6Ase+oGgFHrRVXJ+kQf7qucaU lA/vTwkVn9G+J/4XoI6vSHO9fomVWET9qNnmvuZ8wbUUbn77fdKN4B1EFk14xKSQuWBTXV +brEcpKpMmRBxSfD3NN0CHO6XX3h1kumEg8wkTx3RXFxtNeg7SVkfQaCzwHPWge7ux17oa OQTaTQxo5ojz0fX9nArBqZs2lARgNpLKc3wCFH7xv6APq5/EJnKdJBIA6fAdhpUfJsZbO2 7qPH6icHb3LqXG2lTOcZLFc+Ieq+nMbRny0cWkC4L3YqJZEtlh0qg0JrSm+PZA== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1617900066; a=rsa-sha256; cv=fail; b=SqGt4Vt67jChu4fT42k01g9+CAWZCsq5LVhRWzWitCr8XZj2L9nPHJgzC1ssu0/itxdCgg RtFwkC8y1JDe6NrK+smV+NtmlkkkZSjtmgPlSfdu4OrHhlHKqQRhUjyr+1OA1bIe1hcljY L78H/5GAPVzJfjSZscc/4WUB9AsAVgALCsHI1M5uY6veCrBBtde2pp8Allvr1UfN6YPOEW 7MxqbwZgRIbVppe2B3DACnlTyiHnbrdUox2yyOGb1GW/N+AFf6LVtZOIc20GrcU6EAF1E8 APxyxXdMhG7flIv4W/W/lgEF7ZrXbBTdtw2+uFbLorxLG/OxhcfeJBHq4B3CwA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=VT41qlxA; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=VT41qlxA; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3DF14E31F X-Spam-Score: 3.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: L8BVfCKEfICJ From: Morgan Smith * etc/committer.scm.in (diff-info): Use git diff-files instead of git diff (old-sexp): Use git cat-file instead of git show (main): Add newline to displayed message --- etc/committer.scm.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/etc/committer.scm.in b/etc/committer.scm.in index 7991dc7430..1f19ccfd6d 100755 --- a/etc/committer.scm.in +++ b/etc/committer.scm.in @@ -89,7 +89,7 @@ LINE-NO in PORT." (define (diff-info) "Read the diff and return a list of values." (let ((port (open-pipe* OPEN_READ - "git" "diff" + "git" "diff-files" "--no-prefix" ;; Only include one context line to avoid lumping in ;; new definitions with changes to existing @@ -153,8 +153,9 @@ LINE-NO in PORT." corresponding to the top-level definition containing the staged changes." ;; TODO: We can't seek with a pipe port... (let* ((port (open-pipe* OPEN_READ - "git" "show" (string-append "HEAD:" - (hunk-file-name hunk)))) + "git" "cat-file" "-p" (string-append + "HEAD:" + (hunk-file-name hunk)))) (contents (get-string-all port))) (close-pipe port) (call-with-input-string contents @@ -253,7 +254,7 @@ modifying." (define (main . args) (match (diff-info) (() - (display "Nothing to be done." (current-error-port))) + (display "Nothing to be done.\n" (current-error-port))) (hunks (let-values (((definitions changes) -- 2.31.1