From 3cded564f41736854cd41c6e5c2318f4a7351d7f Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 27 May 2024 22:26:23 -0400 Subject: bin/merge-driver-ekeyword: Store merged output in correct location Fixes: a667d93 ("bin/merge-driver-ekeyword: Look for KEYWORDS changes in upstream commit") Signed-off-by: Matt Turner --- bin/merge-driver-ekeyword | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword index 6d5f869..70c9b3a 100755 --- a/bin/merge-driver-ekeyword +++ b/bin/merge-driver-ekeyword @@ -11,6 +11,7 @@ See https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver import difflib import os +import shutil import sys import tempfile @@ -128,6 +129,8 @@ def main(argv: Sequence[str]) -> int: elif changes := keyword_changes(O, A): # Apply %O -> %A changes to %B result = apply_keyword_changes(B, P, changes) + # Merged file should be left in %A + shutil.move(B, A) sys.exit(result) else: try: -- cgit v1.2.3