From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Thu, 30 Mar 2006 12:06:15 +0000 (+0200)
Subject: cvsimport: use git-update-ref when updating
X-Git-Tag: v1.3.0-rc3~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=42277bc81ce2f4450fe08239e4db34516f879c1d;p=git.git

cvsimport: use git-update-ref when updating

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 <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 3728294e7..c0ae00bda 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) {