Hide Forgot
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:
Fixed in F16.