Thread (5 messages) flat view 5 messages, 3 authors, 2016-06-15

Why does git-mergetool use /dev/tty?

From: Brian Gernhardt <hidden>
Date: 2016-06-15 22:49:22

git-mergetool.sh, lines 298-302:
    if test $last_status -ne 0; then
        prompt_after_failed_merge < /dev/tty || exit 1
    fi
    printf "\n"
    merge_file "$i" < /dev/tty > /dev/tty
Why does git-mergetool ignore the provided STDIN and STDOUT when not given a path to merge?

This wasn't apparent until bb0a484: "mergetool: Skip autoresolved paths" added a test that doesn't provide a file to merge on the command line.

~~ Brian Gernhardt
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help