diff options
| author |   Sam James <sam@gentoo.org> | 2023-08-29 01:50:11 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-08-29 01:51:32 +0100 |
| commit | 263e3d64adac1ee2968233e151d1ee590532f42d (patch) | |
| tree | 61137797a801b4e824ad05589c490b56f8007cb1 | |
| parent | eclean: Make cleaning invalid default (diff) | |
| download | gentoolkit-263e3d64adac1ee2968233e151d1ee590532f42d.tar.gz gentoolkit-263e3d64adac1ee2968233e151d1ee590532f42d.tar.bz2 gentoolkit-263e3d64adac1ee2968233e151d1ee590532f42d.zip | |
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@gentoo.org>
| -rwxr-xr-x | bin/merge-driver-ekeyword | 2 |
1 files changed, 1 insertions, 1 deletions
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__": |