| Summary: | kdiff3 segfaults when used with git mergetool | ||
|---|---|---|---|
| Product: | [Applications] kdiff3 | Reporter: | Thiago Sueto <herzenschein> |
| Component: | application | Assignee: | michael <reeves.87> |
| Status: | RESOLVED FIXED | ||
| Severity: | crash | CC: | isma.af |
| Priority: | NOR | ||
| Version: | unspecified | ||
| Target Milestone: | --- | ||
| Platform: | Other | ||
| OS: | Linux | ||
| Latest Commit: | https://invent.kde.org/sdk/kdiff3/-/commit/bee1ceea9a170a0ac06de55a9fdb499e06403740 | Version Fixed In: | |
| Sentry Crash Report: | |||
Do have the version off kdiff3 you are running? I asked because versions prior to 1.10.6 contain multiple race conditions that are triggered on exit. Typically kdiff3 still exits normally but it can crash. I use kdiff3 as my default git merge tool and have not seen this crash before. The only difference I can see off hand is that I have explicitly set: merge.tool=kdiff3 merge.guitool=kdiff3 diff.tool=kdiff3 diff.guitool=kdiff3 Currently working on 1.11 branch. 1.10.7 is the newest release. My kdiff3 version is: kdiff3 1.11.70 (64 bit) I'm on openSUSE Krypton with Plasma 6, but isma mentioned experiencing this bug in Plasma 5 before. I was able the reproduce a crash on save. I my case the changes were not automatically saved as the merge contained a conflict the required manual intervention. Will push a fix shortly. Git commit 3426fdc15d5e444d2c22f57164ab3ba7972b8f77 by Michael Reeves. Committed on 09/03/2024 at 23:11. Pushed by mreeves into branch '1.11'. Fix crash on Save during merge M +1 -1 src/mergeresultwindow.cpp https://invent.kde.org/sdk/kdiff3/-/commit/3426fdc15d5e444d2c22f57164ab3ba7972b8f77 Git commit bee1ceea9a170a0ac06de55a9fdb499e06403740 by Michael Reeves. Committed on 09/03/2024 at 23:11. Pushed by mreeves into branch 'master'. Fix crash on Save during merge M +1 -1 src/mergeresultwindow.cpp https://invent.kde.org/sdk/kdiff3/-/commit/bee1ceea9a170a0ac06de55a9fdb499e06403740 |
Attempting to run git mergetool while having kdiff3 installed to resolve conflicts for a rebase causes kdiff3 to segfault with output like this: ``` This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help config' for more details. 'git mergetool' will now attempt to use one of the following tools: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff nvimdiff Merging: README.md Normal merge conflict for 'README.md': {local}: modified file {remote}: modified file Hit return to start merge resolution tool (kdiff3): /usr/libexec/git/mergetools/kdiff3: line 11: 22393 Segmentation fault (core dumped) "$merge_tool_path" --auto --L1 "$MERGED (Base)" --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1 merge of README.md failed ``` Running kdiff3 separately runs just fine.