Commit 0750d751 authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

cvsimport: miscellaneous packed-ref fixes

These were found with a grep for '$git_dir'; they all
replace a direct access of "$git_dir/refs/..." with a call
to git-rev-parse or git-update-ref.
Signed-off-by: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 9da0dabc
......@@ -864,29 +864,27 @@ sub commit {
print STDERR "Branch $branch erroneously stems from itself -- changed ancestor to $opt_o\n";
$ancestor = $opt_o;
if (-f "$git_dir/$remote/$branch") {
if (defined get_headref("$remote/$branch")) {
print STDERR "Branch $branch already exists!\n";
unless (open(H,"$git_dir/$remote/$ancestor")) {
my $id = get_headref("$remote/$ancestor");
if (!$id) {
print STDERR "Branch $ancestor does not exist!\n";
$ignorebranch{$branch} = 1;
chomp(my $id = <H>);
unless (open(H,"> $git_dir/$remote/$branch")) {
print STDERR "Could not create branch $branch: $!\n";
system(qw(git update-ref -m cvsimport),
"$remote/$branch", $id);
if($? != 0) {
print STDERR "Could not create branch $branch\n";
$ignorebranch{$branch} = 1;
print H "$id\n"
or die "Could not write branch $branch: $!";
or die "Could not write branch $branch: $!";
$last_branch = $branch if $branch ne $last_branch;
$state = 9;
......@@ -998,7 +996,7 @@ sub commit {
$orig_branch = "master";
print "DONE; creating $orig_branch branch\n" if $opt_v;
system("git-update-ref", "refs/heads/master", "$remote/$opt_o")
unless -f "$git_dir/refs/heads/master";
unless defined get_headref('refs/heads/master');
system("git-symbolic-ref", "$remote/HEAD", "$remote/$opt_o")
if ($opt_r && $opt_o ne 'HEAD');
system('git-update-ref', 'HEAD', "$orig_branch");
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment