Merge branch 'maint'

* maint:
  Use dashless git commands in setgitperms.perl
  git-remote: do not use user input in a printf format string
This commit is contained in:
Junio C Hamano
2008-09-22 09:41:43 -07:00
2 changed files with 10 additions and 12 deletions

View File

@ -50,7 +50,7 @@ if ((@ARGV < 0) || !GetOptions(
)) { die $usage; }
die $usage unless ($read_mode xor $write_mode);
my $topdir = `git-rev-parse --show-cdup` or die "\n"; chomp $topdir;
my $topdir = `git rev-parse --show-cdup` or die "\n"; chomp $topdir;
my $gitdir = $topdir . '.git';
my $gitmeta = $topdir . '.gitmeta';
@ -155,7 +155,7 @@ elsif ($read_mode) {
open (OUT, ">$gitmeta.tmp") or die "Could not open $gitmeta.tmp for writing: $!\n";
}
my @files = `git-ls-files`;
my @files = `git ls-files`;
my %dirs;
foreach my $path (@files) {