summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-16 18:55:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-16 18:55:35 (GMT)
commit29504118f8528f658fd0bfc02d8d78d4c01dc2cc (patch)
tree0412494891ef327fa7070c9fca192ae418e5fe2b /git-cvsimport.perl
parent6abf5c0c6fb2ad9bb24444171d306262a8c8f4a2 (diff)
parent40dad96e41fcb96e31bdf11deec3c7bf6261adbe (diff)
downloadgit-29504118f8528f658fd0bfc02d8d78d4c01dc2cc.zip
git-29504118f8528f658fd0bfc02d8d78d4c01dc2cc.tar.gz
git-29504118f8528f658fd0bfc02d8d78d4c01dc2cc.tar.bz2
Merge branch 'svn' of http://netz.smurf.noris.de/git/git
[jc: I have my pre-commit hook enabled to catch trailing whitespaces, and fixed them up while merging.] Signed-off-by: Junio C Hamano <junkio@cox.net>
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 f7c3a51..0621dc3 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -570,6 +570,7 @@ my $commit = sub {
unless($pid) {
$pr->writer();
$pw->reader();
+ open(OUT,">&STDOUT");
dup2($pw->fileno(),0);
dup2($pr->fileno(),1);
$pr->close();
@@ -587,10 +588,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",