This simplifies code, and also fixes a subtle bug: when importing in a
shared repository, where another user last imported from CVS, cvsimport
used to complain that it could not open <branch> for update.
Signed-off-by: Johannes Schindelin <redacted>
---
git-cvsimport.perl | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 3728294..957af13 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -15,6 +15,7 @@ # You can change that with the '-o' opti
use strict;
use warnings;
+use Fcntl;
use Getopt::Std;
use File::Spec;
use File::Temp qw(tempfile);
@@ -677,11 +678,7 @@ my $commit = sub {
waitpid($pid,0);
die "Error running git-commit-tree: $?\n" if $?;
- open(C,">$git_dir/refs/heads/$branch")
- or die "Cannot open branch $branch for update: $!\n";
- print C "$cid\n"
- or die "Cannot write branch $branch for update: $!\n";
- close(C)
+ system("git-update-ref refs/heads/$branch $cid") == 0
or die "Cannot write branch $branch for update: $!\n";
if($tag) {Johannes Schindelin [off-list ref] writes:
This simplifies code, and also fixes a subtle bug: when importing in a
shared repository, where another user last imported from CVS, cvsimport
used to complain that it could not open <branch> for update.
The second hunk look sensible but I do not know about "use Fcntl"
since I do not see anything you are adding that starts to use it...
Hi,
On Thu, 30 Mar 2006, Junio C Hamano wrote:
Johannes Schindelin [off-list ref] writes:
quoted
This simplifies code, and also fixes a subtle bug: when importing in a
shared repository, where another user last imported from CVS, cvsimport
used to complain that it could not open <branch> for update.
The second hunk look sensible but I do not know about "use Fcntl"
since I do not see anything you are adding that starts to use it...
O_EXCL. Without "use Fcntl;" perl says I am not allowed to use bareword
things in strict mode or some such.
Ciao,
Dscho
Johannes Schindelin [off-list ref] wrote:
Hi,
On Thu, 30 Mar 2006, Junio C Hamano wrote:
quoted
Johannes Schindelin [off-list ref] writes:
quoted
This simplifies code, and also fixes a subtle bug: when importing in a
shared repository, where another user last imported from CVS, cvsimport
used to complain that it could not open <branch> for update.
The second hunk look sensible but I do not know about "use Fcntl"
since I do not see anything you are adding that starts to use it...
O_EXCL. Without "use Fcntl;" perl says I am not allowed to use bareword
things in strict mode or some such.
Huh? I still don't see where O_EXCL is used.
quoted
quoted
+ system("git-update-ref refs/heads/$branch $cid") == 0
Passing args to system() in list form is always preferable in case
there's a shell-unfriendly variable:
system("git-update-ref", "refs/heads/$branch", $cid) == 0
--
Eric Wong
Hi,
On Fri, 31 Mar 2006, Eric Wong wrote:
Johannes Schindelin [off-list ref] wrote:
quoted
Hi,
On Thu, 30 Mar 2006, Junio C Hamano wrote:
quoted
Johannes Schindelin [off-list ref] writes:
quoted
This simplifies code, and also fixes a subtle bug: when importing in a
shared repository, where another user last imported from CVS, cvsimport
used to complain that it could not open <branch> for update.
The second hunk look sensible but I do not know about "use Fcntl"
since I do not see anything you are adding that starts to use it...
O_EXCL. Without "use Fcntl;" perl says I am not allowed to use bareword
things in strict mode or some such.
Huh? I still don't see where O_EXCL is used.
Yes. I did not make that point clear enough, I guess. My first approach
was to reimplement git-update-ref in perl, which worked well enough, until
I remembered that you could just call programs from perl :-)
quoted
quoted
quoted
+ system("git-update-ref refs/heads/$branch $cid") == 0
Passing args to system() in list form is always preferable in case
there's a shell-unfriendly variable:
system("git-update-ref", "refs/heads/$branch", $cid) == 0
Old habit dies hard.
---
git-cvsimport.perl | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 3728294..fe6298b 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -677,11 +677,7 @@ my $commit = sub {
waitpid($pid,0);
die "Error running git-commit-tree: $?\n" if $?;
- open(C,">$git_dir/refs/heads/$branch")
- or die "Cannot open branch $branch for update: $!\n";
- print C "$cid\n"
- or die "Cannot write branch $branch for update: $!\n";
- close(C)
+ system("git-update-ref", "refs/heads/$branch", $cid) == 0
or die "Cannot write branch $branch for update: $!\n";
if($tag) {