diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-22 09:41:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-22 09:41:43 -0700 |
| commit | c76dc9592d1c770212d50ee7a7028a74f472f23b (patch) | |
| tree | 602475028640a75ee745e699a56cd380a07a9a9b /contrib | |
| parent | 2beec8973394e29353a9dccee45657870852ba33 (diff) | |
| parent | 18309f4c3e00886660f15e18c1aaab2f5bc25715 (diff) | |
| download | git-c76dc9592d1c770212d50ee7a7028a74f472f23b.tar.gz git-c76dc9592d1c770212d50ee7a7028a74f472f23b.tar.xz | |
Merge branch 'maint'
* maint:
Use dashless git commands in setgitperms.perl
git-remote: do not use user input in a printf format string
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/hooks/setgitperms.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/hooks/setgitperms.perl b/contrib/hooks/setgitperms.perl index dab7c8e3a..a577ad095 100644 --- a/contrib/hooks/setgitperms.perl +++ b/contrib/hooks/setgitperms.perl @@ -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) { |