Bug 679742 - Ctrl+C on git-mergetool makes infinite loop
Summary: Ctrl+C on git-mergetool makes infinite loop
Keywords:
Status: CLOSED NEXTRELEASE
Alias: None
Product: Fedora
Classification: Fedora
Component: git
Version: 14
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Chris Wright
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2011-02-23 11:54 UTC by Kamil Páral
Modified: 2013-01-10 10:50 UTC (History)
5 users (show)

Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Clone Of:
Environment:
Last Closed: 2012-03-01 12:46:49 UTC
Type: ---


Attachments (Terms of Use)

Description Kamil Páral 2011-02-23 11:54:48 UTC
Description of problem:
I had a merge with conflict. I run "git mergetool" (using meld). I solved several problems in several files. Then on one file I decided I want to cancel the merging (of that one file). While meld was running, I switched to waiting terminal and hit Ctrl+C.

After that I received thousands and thousands of lines:

Was the merge successful? [y/n] /usr/libexec/git-core/git-mergetool--lib: line 38: read: read error: 0: Input/output error
hooks/post-koji-build/watch-koji-builds.py seems unchanged.
Was the merge successful? [y/n] /usr/libexec/git-core/git-mergetool--lib: line 38: read: read error: 0: Input/output error
hooks/post-koji-build/watch-koji-builds.py seems unchanged.
Was the merge successful? [y/n] /usr/libexec/git-core/git-mergetool--lib: line 38: read: read error: 0: Input/output error
hooks/post-koji-build/watch-koji-builds.py seems unchanged.
Was the merge successful? [y/n] /usr/libexec/git-core/git-mergetool--lib: line 38: read: read error: 0: Input/output error
hooks/post-koji-build/watch-koji-builds.py seems unchanged.

I had to kill the process.

Version-Release number of selected component (if applicable):
git-1.7.4-1.fc14.x86_64

How reproducible:
always

Steps to Reproduce:
1. have merge conflict
2. run git-mergetool 
3. hit enter to use mergetool (meld in my case)
4. switch back to terminal, hit Ctrl+C
  
Actual results:
process in an infinite loop

Expected results:
correct termination

Additional info:

Comment 1 Kamil Páral 2012-03-01 12:46:49 UTC
Fixed in F16.


Note You need to log in before you can comment on or make changes to this bug.