commit: 263e3d64adac1ee2968233e151d1ee590532f42d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 00:50:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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__":
