Merge branch 'fixes'

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index f7c3a515936ac33320c1df3a5f2db71cf3ae3a92..0621dc3e2f6d8de2f0019164d57cc8916deb6b98 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -570,6 +570,7 @@ ($$)
        unless($pid) {
                $pr->writer();
                $pw->reader();
+               open(OUT,">&STDOUT");
                dup2($pw->fileno(),0);
                dup2($pr->fileno(),1);
                $pr->close();
@@ -587,10 +588,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",