summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-30 18:06:39 -0800
committerJunio C Hamano <junkio@cox.net>2005-10-30 18:06:39 -0800
commite634aec752642dcf86c3fc82025e43381d6768c2 (patch)
treea589b6756894d18c841ac61499e5d2c9beda36fd /git-cvsimport.perl
parenta1c7a69047e88244ed321b5aa2a8bcbba5a869c2 (diff)
parent80e0c0ab91e1cf6a6315d0431bf6873ebbf8bef0 (diff)
GIT 0.99.9av0.99.9a
... to contain the RPM workaround. 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 f00f7596b7..bbb83fb71c 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",