From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jun 2007 04:04:52 +0000 (-0700)
Subject: Merge branch 'aw/cvs'
X-Git-Tag: v1.5.3-rc0~110
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9bfe9f80b1f57dd5bd63c94516fb8aa820fef1cd;p=git.git

Merge branch 'aw/cvs'

* aw/cvs:
  cvsimport: add <remote>/HEAD reference in separate remotes more
  cvsimport: update documentation to include separate remotes option
  cvsimport: add support for new style remote layout
---

9bfe9f80b1f57dd5bd63c94516fb8aa820fef1cd
diff --cc git-cvsimport.perl
index 75d65d414,598b9c8da..433b7fd32
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@@ -520,9 -528,9 +528,9 @@@ sub is_sha1 
  
  sub get_headref ($$) {
      my $name    = shift;
 -    my $git_dir = shift; 
 -    
 +    my $git_dir = shift;
 +
-     my $f = "$git_dir/refs/heads/$name";
+     my $f = "$git_dir/$remote/$name";
      if (open(my $fh, $f)) {
  	    chomp(my $r = <$fh>);
  	    is_sha1($r) or die "Cannot get head id for $name ($r): $!";