Thread: [Lxr-commits] CVS: lxr/lib/LXR/Files GIT.pm,1.13,1.14
Brought to you by:
ajlittoz
From: Andre-Littoz <ajl...@us...> - 2013-09-23 15:20:30
|
Update of /cvsroot/lxr/lxr/lib/LXR/Files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25646/lib/LXR/Files Modified Files: GIT.pm Log Message: Git.pm: separate filename from options Add -- (end of options) on all Git commands before the filename, so that an initial hyphen does not cause interpretation as an option. Index: GIT.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/GIT.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- GIT.pm 21 Sep 2013 12:54:52 -0000 1.13 +++ GIT.pm 23 Sep 2013 15:20:27 -0000 1.14 @@ -89,7 +89,7 @@ if ($pathname eq '') { $git = $self->_git_cmd ('ls-tree', $releaseid); } else { - $git = $self->_git_cmd ('ls-tree', $releaseid, $pathname); + $git = $self->_git_cmd ('ls-tree', $releaseid, '--', $pathname); } while (<$git>) { if (m/(\d+) (\w+) ([[:xdigit:]]+)\t(.*)/) { @@ -156,7 +156,7 @@ # to be relative to 'rootpath'. Changes LXR convention. $filename =~ s,^/+,,; - my $sha1hashline = $self->_git_oneline ('ls-tree', $releaseid, $filename); + my $sha1hashline = $self->_git_oneline ('ls-tree', $releaseid, '--', $filename); if ($sha1hashline =~ m/\d+ blob ([[:xdigit:]]+)\t.*/) { return substr ($self->_git_oneline ('rev-list' @@ -198,7 +198,7 @@ $self->{'authors'} = []; return $self; } else { - my $sha1hashline = $self->_git_oneline ('ls-tree', $releaseid, $filename); + my $sha1hashline = $self->_git_oneline ('ls-tree', $releaseid, '--', $filename); if ($sha1hashline =~ m/^\d+ blob ([[:xdigit:]]+)\t.*/) { my $fh = $self->_git_cmd ('cat-file', 'blob', $1); die('Error executing "git cat-file"') unless $fh; @@ -308,7 +308,7 @@ if ($pathname eq '') { return 1 == 1; } else { - my $line = $self->_git_oneline ('ls-tree', $releaseid, $pathname); + my $line = $self->_git_oneline ('ls-tree', $releaseid, '--', $pathname); return $line =~ m/^\d+ tree .*$/; } } @@ -322,7 +322,7 @@ if ($pathname eq '') { return 1 == 0; } else { - my $line = $self->_git_oneline ('ls-tree', $releaseid, $pathname); + my $line = $self->_git_oneline ('ls-tree', $releaseid, '--', $pathname); return $line =~ m/^\d+ blob .*$/; } } |