@matheusbsbs / matheus-bagliano / commits / 89764f5d8b
Fork 0

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>

Matthias Urlichs committed Oct 10, 2005 at 11:15 UTC 89764f5d8b0ca8600e3a200e9f863c3c7a3ff5e8
1 file changed +3 -3
git-cvsimport.perl
+3 -3
@@ -567,6 +567,7 @@ my $commit = sub {
567 unless($pid) {
568 $pr->writer();
569 $pw->reader();
570 + open(OUT,">&STDOUT");
571 dup2($pw->fileno(),0);
572 dup2($pr->fileno(),1);
573 $pr->close();
@@ -584,10 +585,9 @@ my $commit = sub {
585 if ( -e "$git_dir/refs/heads/$mparent") {
586 $mparent = get_headref($mparent, $git_dir);
587 push @par, '-p', $mparent;
587 - # printing here breaks import #
588 - # # print "Merge parent branch: $mparent\n" if $opt_v;
588 + print OUT "Merge parent branch: $mparent\n" if $opt_v;
589 }
590 - }
590 + }
591 }
592
593 exec("env",