Bug 679742

Summary:	Ctrl+C on git-mergetool makes infinite loop
Product:	[Fedora] Fedora	Reporter:	Kamil Páral <kparal>
Component:	git	Assignee:	Chris Wright <chrisw>
Status:	CLOSED NEXTRELEASE	QA Contact:	Fedora Extras Quality Assurance <extras-qa>
Severity:	unspecified	Docs Contact:
Priority:	unspecified
Version:	14	CC:	atkac, bkearney, chrisw, npajkovs, tmz
Target Milestone:	---
Target Release:	---
Hardware:	Unspecified
OS:	Unspecified
Whiteboard:
Fixed In Version:		Doc Type:	Bug Fix
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2012-03-01 12:46:49 UTC	Type:	---
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:

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.