diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-21 11:16:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-21 11:16:20 -0800 |
| commit | 2470653196fa8461ff5895c521519e947482eae1 (patch) | |
| tree | c749a8d563af6e567b49a97388da92f1402689cb /contrib | |
| parent | b5a40a57240cc292c32e691d3b3c550f6cf8d98c (diff) | |
| parent | 5bac4a671907604b5fb4e24ff682d5b0e8431931 (diff) | |
| download | git-2470653196fa8461ff5895c521519e947482eae1.tar.gz git-2470653196fa8461ff5895c521519e947482eae1.tar.xz | |
Merge branch 'maint'
* maint:
Use gunzip -c over gzcat in import-tars example.
git-gui: Don't crash in citool mode on initial commit.
git-gui: Remove TODO list.
git-gui: Include browser in our usage message.
git-gui: Change summary of git-gui.
git-gui: Display all authors of git-gui.
git-gui: Use mixed path for docs on Cygwin.
git-gui: Correct crash when saving options in blame mode.
git-gui: Expose the browser as a subcommand.
git-gui: Create new branches from a tag.
git-gui: Prefer version file over git-describe.
git-gui: Print version on the console.
git-gui: More consistently display the application name.
git-gui: Permit merging tags into the current branch.
git-gui: Basic version check to ensure git 1.5.0 or later is used.
git-gui: Refactor 'exec git subcmd' idiom.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/import-tars.perl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl index 990c9e70b..5585a8b2c 100755 --- a/contrib/fast-import/import-tars.perl +++ b/contrib/fast-import/import-tars.perl @@ -25,11 +25,14 @@ foreach my $tar_file (@ARGV) my $tar_name = $1; if ($tar_name =~ s/\.(tar\.gz|tgz)$//) { - open(I, '-|', 'gzcat', $tar_file) or die "Unable to gzcat $tar_file: $!\n"; + open(I, '-|', 'gunzip', '-c', $tar_file) + or die "Unable to gunzip -c $tar_file: $!\n"; } elsif ($tar_name =~ s/\.(tar\.bz2|tbz2)$//) { - open(I, '-|', 'bzcat', $tar_file) or die "Unable to bzcat $tar_file: $!\n"; + open(I, '-|', 'bunzip2', '-c', $tar_file) + or die "Unable to bunzip2 -c $tar_file: $!\n"; } elsif ($tar_name =~ s/\.tar\.Z$//) { - open(I, '-|', 'zcat', $tar_file) or die "Unable to zcat $tar_file: $!\n"; + open(I, '-|', 'uncompress', '-c', $tar_file) + or die "Unable to uncompress -c $tar_file: $!\n"; } elsif ($tar_name =~ s/\.tar$//) { open(I, $tar_file) or die "Unable to open $tar_file: $!\n"; } else { |