summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorMatthias Urlichs <smurf@smurf.noris.de>2005-10-10 09:15:09 (GMT)
committerMatthias Urlichs <smurf@smurf.noris.de>2005-10-10 09:15:09 (GMT)
commit89764f5d8b0ca8600e3a200e9f863c3c7a3ff5e8 (patch)
tree73a1055dc8b7cd751210b2fa77add339018e3c8d /git-cvsimport.perl
parent3ff8cbeda635422f4740d325d56288dfdea10179 (diff)
downloadgit-89764f5d8b0ca8600e3a200e9f863c3c7a3ff5e8.zip
git-89764f5d8b0ca8600e3a200e9f863c3c7a3ff5e8.tar.gz
git-89764f5d8b0ca8600e3a200e9f863c3c7a3ff5e8.tar.bz2
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>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index f35c0d0..cc0eed2 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -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",