git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Bug report: git freezes when `git mergetool` crashes

From
TTTomas Tomecek <ttomecek@redhat.com>
Date
Feb 6, 2019, 20:32 UTC
Message-ID
<CALJ-GUBGcpctd-tRBtAHJJiemUvNQTp_AwUKPNtX_8Hc9ehRAQ@mail.gmail.com>
In-Reply-To
<CALJ-GUD+6+_zrpEiWcKe7JwmM2t24R_NLpkk3Kg8g0VevCo1MQ@mail.gmail.com>

I am using vimdiff as my merge tool. Unfortunately, vim(diff) crashed and it froze my terminal completely, so I had to kill git. That was kinda painful since I lost some of the work I did.

My expectation is that git should be able to recover from mergetool crash.

I'm actually unsure if git can actually do something about this. Please let me know whether I should report this at vimdiff.

My environment is:

Fedora 29 vim-enhanced-8.1.847-2.fc29.x86_64 git-core-2.20.1-1.fc29.x86_64

Related bug report: https://github.com/rebase-helper/rebase-helper/issues/564
Message 1 of 1 in “Bug report: git freezes when `git mergetool` crashes”
  1. Tomas TomecekFeb 6, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.