kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge git://git.bogomips.org/git-svn 

* git://git.bogomips.org/git-svn:
  git svn: fix dcommit to work with touched files
  git svn: add an option to recode pathnames
maint
Junio C Hamano 2010-08-02 15:38:55 -07:00
parent 9f9aa76130 181264ad59
commit e7bdd1b90b
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-svn.txt
View File

@ -646,6 +646,12 @@ svn.brokenSymlinkWorkaround::
revision fetched. If unset, 'git svn' assumes this option to revision fetched. If unset, 'git svn' assumes this option to
be "true". be "true".


svn.pathnameencoding::
This instructs git svn to recode pathnames to a given encoding.
It can be used by windows users and by those who work in non-utf8
locales to avoid corrupted file names with non-ASCII characters.
Valid encodings are the ones supported by Perl's Encode module.

Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
options all affect the metadata generated and used by 'git svn'; they options all affect the metadata generated and used by 'git svn'; they
*must* be set in the configuration file before any history is imported *must* be set in the configuration file before any history is imported

10
git-svn.perl
View File

@ -494,6 +494,7 @@ sub cmd_set_tree {


sub cmd_dcommit { sub cmd_dcommit {
my $head = shift; my $head = shift;
command_noisy(qw/update-index --refresh/);
git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) } git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
'Cannot dcommit with a dirty index. Commit your changes first, ' 'Cannot dcommit with a dirty index. Commit your changes first, '
. "or stash them with `git stash'.\n"; . "or stash them with `git stash'.\n";
@ -4050,6 +4051,7 @@ sub new {
$self->{absent_dir} = {}; $self->{absent_dir} = {};
$self->{absent_file} = {}; $self->{absent_file} = {};
$self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new }); $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
$self->{pathnameencoding} = Git::config('svn.pathnameencoding');
$self; $self;
} }


@ -4133,6 +4135,10 @@ sub open_directory {


sub git_path { sub git_path {
my ($self, $path) = @_; my ($self, $path) = @_;
if (my $enc = $self->{pathnameencoding}) {
require Encode;
Encode::from_to($path, 'UTF-8', $enc);
}
if ($self->{path_strip}) { if ($self->{path_strip}) {
$path =~ s!$self->{path_strip}!! or $path =~ s!$self->{path_strip}!! or
die "Failed to strip path '$path' ($self->{path_strip})\n"; die "Failed to strip path '$path' ($self->{path_strip})\n";
@ -4521,6 +4527,10 @@ sub split_path {


sub repo_path { sub repo_path {
my ($self, $path) = @_; my ($self, $path) = @_;
if (my $enc = $self->{pathnameencoding}) {
require Encode;
Encode::from_to($path, $enc, 'UTF-8');
}
$self->{path_prefix}.(defined $path ? $path : ''); $self->{path_prefix}.(defined $path ? $path : '');
} }



11
t/t9100-git-svn-basic.sh
View File

@ -271,6 +271,17 @@ test_expect_success 'able to dcommit to a subdirectory' "
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
" "


test_expect_success 'dcommit should not fail with a touched file' '
test_commit "commit-new-file-foo2" foo2 &&
test-chmtime =-60 foo &&
git svn dcommit
'

test_expect_success 'rebase should not fail with a touched file' '
test-chmtime =-60 foo &&
git svn rebase
'

test_expect_success 'able to set-tree to a subdirectory' " test_expect_success 'able to set-tree to a subdirectory' "
echo cba > d && echo cba > d &&
git update-index d && git update-index d &&