mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 03:00:25 +02:00
Code

git-svn: delay term initialization

Browse Source 
On my Debian 7 system, this fixes annoying warnings when the output
of "git svn" commands are redirected:

    Unable to get Terminal Size. The TIOCGWINSZ ioctl didn't work.
    The COLUMNS and LINES environment variables didn't work. The
    resize program didn't work.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong 2014-09-14 07:38:29 +00:00
parent a831a3fd86
commit 30d45f798d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-svn.perl
View File

@ -306,13 +306,16 @@ sub readline {
}
package main;
my $term = eval {
$ENV{"GIT_SVN_NOTTY"}
? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
: new Term::ReadLine 'git-svn';
};
if ($@) {
$term = new FakeTerm "$@: going non-interactive";
my $term;
sub term_init {
$term = eval {
$ENV{"GIT_SVN_NOTTY"}
? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
: new Term::ReadLine 'git-svn';
};
if ($@) {
$term = new FakeTerm "$@: going non-interactive";
}
}
my $cmd;
@ -424,6 +427,7 @@ sub ask {
my $default = $arg{default};
my $resp;
my $i = 0;
term_init() unless $term;
if ( !( defined($term->IN)
&& defined( fileno($term->IN) )