mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/unquote-path-in-git-pm' into maint

Browse Source 
Code refactoring.

* pw/unquote-path-in-git-pm:
  t9700: add tests for Git::unquote_path()
  Git::unquote_path(): throw an exception on bad path
  Git::unquote_path(): handle '\a'
  add -i: move unquote_path() to Git.pm
This commit is contained in:
Junio C Hamano
2017-07-31 13:51:05 -07:00
parent 133578a020 3f9c637ec7
commit c6767f45e3
3 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
git-add--interactive.perl
View File

@ -3,7 +3,7 @@
use 5.008;
use strict;
use warnings;
use Git;
use Git qw(unquote_path);
use Git::I18N;
binmode(STDOUT, ":raw");
@ -175,47 +175,6 @@ if (!defined $GIT_DIR) {
}
chomp($GIT_DIR);
my %cquote_map = (
"b" => chr(8),
"t" => chr(9),
"n" => chr(10),
"v" => chr(11),
"f" => chr(12),
"r" => chr(13),
"\\" => "\\",
"\042" => "\042",
);
sub unquote_path {
local ($_) = @_;
my ($retval, $remainder);
if (!/^\042(.*)\042$/) {
return $_;
}
($_, $retval) = ($1, "");
while (/^([^\\]*)\\(.*)$/) {
$remainder = $2;
$retval .= $1;
for ($remainder) {
if (/^([0-3][0-7][0-7])(.*)$/) {
$retval .= chr(oct($1));
$_ = $2;
last;
}
if (/^([\\\042btnvfr])(.*)$/) {
$retval .= $cquote_map{$1};
$_ = $2;
last;
}
# This is malformed -- just return it as-is for now.
return $_[0];
}
$_ = $remainder;
}
$retval .= $_;
return $retval;
}
sub refresh {
my $fh;
open $fh, 'git update-index --refresh |'