git mergetool does not work since 2.29.0

* git mergetool does not work since 2.29.0
@ 2020-10-28  7:25 Zaoshi
  2020-12-01 20:58 ` Johannes Schindelin
  0 siblings, 1 reply; 2+ messages in thread
From: Zaoshi @ 2020-10-28  7:25 UTC (permalink / raw)
  To: git

Hello,

I have tried using 'git bugreport' but could not figure out how to edit 
text in the console and send report, so I'm just reusing that form in 
this email. Let me know if any other information is needed.

What did you do before the bug happened?
Ran the following commands:
git checkout mybranch
git merge master
git mergetool

What did you expect to happen?
I expected git to open my configured mergetool

What happened instead?
It fails with message "merge of myfile.cs failed"

What's different between what you expected and what actually happened?
Merge does not work.

Anything else you want to add:
This issue started to happen since git version 2.29.0. Earlier versions 
work as expected.

.gitconfig:
[core]
     editor = \"C:\\Microsoft VS Code\\Code.exe\" --wait
[user]
     name = myname
     email = myemail
[fetch]
     prune = true
[pull]
     rebase = true
[diff]
     tool = bc4
[merge]
     tool = bc4
[difftool "bc4"]
     cmd = \"c:\\Program Files\\Beyond Compare 4\\bcomp.exe\" $LOCAL $REMOTE
     trustExitCode = true
[mergetool "bc4"]
     cmd = \"c:\\Program Files\\Beyond Compare 4\\bcomp.exe\" $LOCAL 
$REMOTE $BASE $MERGED
     trustExitCode = true

[System Info]
git version:
git version 2.29.1.windows.1
cpu: x86_64
built from commit: e6d53c456169235fe72602e2b4d985934fa9ad23
sizeof-long: 4
sizeof-size_t: 8
shell-path: /bin/sh
uname: Windows 10.0 19041
compiler info: gnuc: 10.2
libc info: no libc information available
$SHELL (typically, interactive shell): <unset>

[Enabled Hooks]

Regards,
Z

^ permalink raw reply	[flat|nested] 2+ messages in thread