зеркало из https://github.com/microsoft/git.git
cvsimport: report merge parents
Matching and reporting merge parents happens in a subprocess. Re-open stdout before redirecting stdout to the pipe, so that printing verbose messages doesn't go to the wrong place. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
This commit is contained in:
Родитель
3ff8cbeda6
Коммит
89764f5d8b
|
@ -567,6 +567,7 @@ my $commit = sub {
|
|||
unless($pid) {
|
||||
$pr->writer();
|
||||
$pw->reader();
|
||||
open(OUT,">&STDOUT");
|
||||
dup2($pw->fileno(),0);
|
||||
dup2($pr->fileno(),1);
|
||||
$pr->close();
|
||||
|
@ -584,10 +585,9 @@ my $commit = sub {
|
|||
if ( -e "$git_dir/refs/heads/$mparent") {
|
||||
$mparent = get_headref($mparent, $git_dir);
|
||||
push @par, '-p', $mparent;
|
||||
# printing here breaks import #
|
||||
# # print "Merge parent branch: $mparent\n" if $opt_v;
|
||||
print OUT "Merge parent branch: $mparent\n" if $opt_v;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
exec("env",
|
||||
|
|
Загрузка…
Ссылка в новой задаче