提交 89764f5d 编写于 作者: M Matthias Urlichs

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: NMatthias Urlichs <smurf@smurf.noris.de>
上级 3ff8cbed
......@@ -567,6 +567,7 @@ ($$)
unless($pid) {
$pr->writer();
$pw->reader();
open(OUT,">&STDOUT");
dup2($pw->fileno(),0);
dup2($pr->fileno(),1);
$pr->close();
......@@ -584,10 +585,9 @@ ($$)
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",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册