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

Merge branch 'mh/git-svn-automkdirs'

Browse Source 
* mh/git-svn-automkdirs:
  git-svn: add an option to skip the creation of empty directories
This commit is contained in:
Junio C Hamano
2011-04-27 11:36:41 -07:00
parent 95fd6e21f1 55f9d7a75c
commit 698a9ab3f1
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
git-svn.perl
View File

@ -784,6 +784,15 @@ sub cmd_find_rev {
print "$result\n" if $result;
}
sub auto_create_empty_directories {
my ($gs) = @_;
my $var = eval { command_oneline('config', '--get', '--bool',
"svn-remote.$gs->{repo_id}.automkdirs") };
# By default, create empty directories by consulting the unhandled log,
# but allow setting it to 'false' to skip it.
return !($var && $var eq 'false');
}
sub cmd_rebase {
command_noisy(qw/update-index --refresh/);
my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
@ -807,7 +816,9 @@ sub cmd_rebase {
$_fetch_all ? $gs->fetch_all : $gs->fetch;
}
command_noisy(rebase_cmd(), $gs->refname);
$gs->mkemptydirs;
if (auto_create_empty_directories($gs)) {
$gs->mkemptydirs;
}
}
sub cmd_show_ignore {
@ -1245,7 +1256,9 @@ sub post_fetch_checkout {
command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
print STDERR "Checked out HEAD:\n ",
$gs->full_url, " r", $gs->last_rev, "\n";
$gs->mkemptydirs($gs->last_rev);
if (auto_create_empty_directories($gs)) {
$gs->mkemptydirs($gs->last_rev);
}
}
sub complete_svn_url {