mirror of
https://github.com/git/git.git
synced 2026-03-14 10:53:25 +01:00
Merge branch 'js/mv' into next
* js/mv: builtin git-mv: support moving directories Make git-mv a builtin Extract helper bits from c-merge-recursive work git-cvsserver: support multiline commit messages t7001: add test for git-mv dir1 dir2/ gitweb: fix two warnings git-instaweb: respect bindir from Makefile git-instaweb: some Apache have mod_cgi builtin t4112: simplify the test and remove unneeded working tree file. Extend testing git-mv for renaming of subdirectories
This commit is contained in:
@@ -795,7 +795,7 @@ sub git_read_projects {
|
||||
if (-d $projects_list) {
|
||||
# search in directory
|
||||
my $dir = $projects_list;
|
||||
opendir my $dh, $dir or return undef;
|
||||
opendir my ($dh), $dir or return undef;
|
||||
while (my $dir = readdir($dh)) {
|
||||
if (-e "$projectroot/$dir/HEAD") {
|
||||
my $pr = {
|
||||
@@ -810,7 +810,7 @@ sub git_read_projects {
|
||||
# 'git%2Fgit.git Linus+Torvalds'
|
||||
# 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
|
||||
# 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
|
||||
open my $fd , $projects_list or return undef;
|
||||
open my ($fd), $projects_list or return undef;
|
||||
while (my $line = <$fd>) {
|
||||
chomp $line;
|
||||
my ($path, $owner) = split ' ', $line;
|
||||
|
||||
Reference in New Issue
Block a user