From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EFB1915800A for ; Tue, 29 Aug 2023 00:51:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 340822BC014; Tue, 29 Aug 2023 00:51:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 151EF2BC014 for ; Tue, 29 Aug 2023 00:51:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08971340D78 for ; Tue, 29 Aug 2023 00:51:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56D6DB84 for ; Tue, 29 Aug 2023 00:51:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1693270292.263e3d64adac1ee2968233e151d1ee590532f42d.sam@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: bin/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: bin/merge-driver-ekeyword X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 263e3d64adac1ee2968233e151d1ee590532f42d X-VCS-Branch: master Date: Tue, 29 Aug 2023 00:51:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7b7013e5-96ef-4f60-ba96-8d22909060f4 X-Archives-Hash: 60f9fe61cce5004696e0d466ee351eaa commit: 263e3d64adac1ee2968233e151d1ee590532f42d Author: Sam James gentoo org> AuthorDate: Tue Aug 29 00:50:11 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 29 00:51:32 2023 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=263e3d64 bin/merge-driver-ekeyword: fix compatibility with >=git-2.42.0 Commit 2b7b788fb31a74bcbff4e4c6efc6f3db6c3a49b7 upstream makes more use of the result from a merge driver. Correctly surface the result from `git merge-file` so that we don't wrongly throw away information but also don't make git think the driver crashed (-1 is for exceptional cases, not "failed to merge"). Signed-off-by: Sam James gentoo.org> bin/merge-driver-ekeyword | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword index f75056c..e59e10c 100755 --- a/bin/merge-driver-ekeyword +++ b/bin/merge-driver-ekeyword @@ -127,7 +127,7 @@ def main(argv: Sequence[str]) -> int: sys.exit(result) else: result = os.system(f"git merge-file -L HEAD -L base -L ours {A} {O} {B}") - sys.exit(0 if result == 0 else -1) + sys.exit(result) if __name__ == "__main__":