diff options
| author | Charles Bailey <charles@hashpling.org> | 2010-08-20 16:25:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 14:09:04 -0700 |
| commit | af3147147f39274bd0d47faca196f84c4e9ec68d (patch) | |
| tree | 020b1f727a6786ce01dfeacf5c86e83acabc4f5d /lockfile.c | |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff) | |
| download | git-af3147147f39274bd0d47faca196f84c4e9ec68d.tar.gz | |
mergetool: Remove explicit references to /dev/tty
mergetool used /dev/tty to switch back to receiving input from the user
via inside a block with a redirected stdin.
This harms testability, so change mergetool to save its original stdin
to an alternative fd in this block and restore it for those sub-commands
that need the original stdin.
Includes additional compatibility fix from Jonathan Nieder.
Tested-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions