From bb24ded5e8183ea3b69687a1cf18a45409172f0e Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Thu, 14 Nov 2024 08:34:57 -0800 Subject: [PATCH] mergiraf_absolutepath is a variable that holds a path, not a command that yields a path --- src/scripts/merge_tools/mergiraf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/merge_tools/mergiraf.sh b/src/scripts/merge_tools/mergiraf.sh index ecc689d20a..e5e558380b 100755 --- a/src/scripts/merge_tools/mergiraf.sh +++ b/src/scripts/merge_tools/mergiraf.sh @@ -59,7 +59,7 @@ cd "$clone_dir" || { echo "$0: cannot cd to $clone_dir"; exit 2; } # set up mergiraf driver git config --local merge.mergiraf.name mergiraf git config --local merge.mergiraf.driver "${mergiraf_absolutepath} merge --git %O %A %B -s %S -x %X -y %Y -p %P" -$(mergiraf_absolutepath) languages --gitattributes >> .gitattributes +$mergiraf_absolutepath languages --gitattributes >> .gitattributes # perform merge git checkout "$branch1" --force