From: Tomas Tomecek <ttomecek@redhat.com>
To: git@vger.kernel.org
Subject: Bug report: git freezes when `git mergetool` crashes
Date: Wed, 6 Feb 2019 21:32:02 +0100 [thread overview]
Message-ID: <CALJ-GUBGcpctd-tRBtAHJJiemUvNQTp_AwUKPNtX_8Hc9ehRAQ@mail.gmail.com> (raw)
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
parent reply other threads:[~2019-02-06 20:32 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <CALJ-GUD+6+_zrpEiWcKe7JwmM2t24R_NLpkk3Kg8g0VevCo1MQ@mail.gmail.com>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CALJ-GUBGcpctd-tRBtAHJJiemUvNQTp_AwUKPNtX_8Hc9ehRAQ@mail.gmail.com \
--to=ttomecek@redhat.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).