Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
cvsimport: report merge parents
author
Matthias Urlichs
<smurf@smurf.noris.de>
Mon, 10 Oct 2005 09:15:09 +0000
(11:15 +0200)
committer
Matthias Urlichs
<smurf@smurf.noris.de>
Mon, 10 Oct 2005 09:15:09 +0000
(11:15 +0200)
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>
git-cvsimport.perl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
3ff8cbe
)
diff --git
a/git-cvsimport.perl
b/git-cvsimport.perl
index f35c0d045b3db937e8bf447063c81e869b800f7e..cc0eed29463735950b0b0ec41de7197006fc204a 100755
(executable)
--- a/
git-cvsimport.perl
+++ b/
git-cvsimport.perl
@@
-567,6
+567,7
@@
($$)
unless($pid) {
$pr->writer();
$pw->reader();
+ open(OUT,">&STDOUT");
dup2($pw->fileno(),0);
dup2($pr->fileno(),1);
$pr->close();
@@
-584,10
+585,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",