diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-06 22:43:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-06 22:43:24 (GMT) |
| commit | d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3 (patch) | |
| tree | ca47f19971689badb2b644d038a72f4b0d9d8f13 /git-cvsimport.perl | |
| parent | f07dfbad29d473b35b5fecebf4baf77e32c7f97f (diff) | |
| parent | e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3 (diff) | |
| download | git-d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.zip git-d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.tar.gz git-d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.tar.bz2 | |
Merge branch 'sv/objfixes'
* sv/objfixes:
Don't assume tree entries that are not dirs are blobs
git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
fix documentation of unpack-objects -n
Accept dates before 2000/01/01 when specified as seconds since the epoch
Diffstat (limited to 'git-cvsimport.perl')
| -rwxr-xr-x | git-cvsimport.perl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index f68afe7..4e6c9c6 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -692,8 +692,8 @@ sub commit { if ($branch eq $opt_o && !$index{branch} && !get_headref($branch, $git_dir)) { # looks like an initial commit # use the index primed by git-init - $ENV{GIT_INDEX_FILE} = '.git/index'; - $index{$branch} = '.git/index'; + $ENV{GIT_INDEX_FILE} = "$git_dir/index"; + $index{$branch} = "$git_dir/index"; } else { # use an index per branch to speed up # imports of projects with many branches @@ -984,7 +984,7 @@ if ($line =~ /^(\d+) objects, (\d+) kilobytes$/) { } foreach my $git_index (values %index) { - if ($git_index ne '.git/index') { + if ($git_index ne "$git_dir/index") { unlink($git_index); } } |