Wesley <wesleys@xxxxxxxxxxxxxxx> writes: > On 8/10/23 21:01, Junio C Hamano wrote: >> Wesley Schwengle <wesleys@xxxxxxxxxxxxxxx> writes: >> This line with "};" on it should not be added, I think. >> cf. https://github.com/git/git/actions/runs/5827208598/job/15802787783#step:5:74 >> >>> + return $term; >>> } >>> } >> git-svn.perl | 1 - >> 1 file changed, 1 deletion(-) >> diff --git a/git-svn.perl b/git-svn.perl >> index 93f6538d61..e919c3f172 100755 >> --- a/git-svn.perl >> +++ b/git-svn.perl >> @@ -307,7 +307,6 @@ package main; >> $term = $ENV{"GIT_SVN_NOTTY"} >> ? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT >> : new Term::ReadLine 'git-svn'; >> - }; >> return $term; >> } >> } > > You are 100% correct. And embarrassingly, the above is not sufficient, as the way $term is used in git-send-email and git-svn are subtly different. I think we further need something like this on top, but my Perl is rusty. diff --git a/git-svn.perl b/git-svn.perl index e919c3f172..6033b97a0c 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -427,7 +427,7 @@ sub ask { my $default = $arg{default}; my $resp; my $i = 0; - term_init() unless $term; + my $term = term_init(); if ( !( defined($term->IN) && defined( fileno($term->IN) ) -- 2.42.0-rc1
