global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 12:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Documentation/git.txt: update list of maintenance releases
  t9143: do not fail when unhandled.log.gz is not created
  git-svn: allow the mergeinfo property to be set
This commit is contained in:
Junio C Hamano
2010-12-09 16:51:08 -08:00
parent d3b060c6ad 2f76a26ee7
commit 2d0123ccb9
4 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/git.txt
View File

@@ -44,31 +44,35 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
* link:v1.7.3.2/git.html[documentation for release 1.7.3.2]
* link:v1.7.3.3/git.html[documentation for release 1.7.3.3]
* release notes for
link:RelNotes/1.7.3.3.txt[1.7.3.3],
link:RelNotes/1.7.3.2.txt[1.7.3.2],
link:RelNotes/1.7.3.1.txt[1.7.3.1],
link:RelNotes/1.7.3.txt[1.7.3].
* link:v1.7.2.3/git.html[documentation for release 1.7.2.3]
* link:v1.7.2.4/git.html[documentation for release 1.7.2.4]
* release notes for
link:RelNotes/1.7.2.4.txt[1.7.2.4],
link:RelNotes/1.7.2.3.txt[1.7.2.3],
link:RelNotes/1.7.2.2.txt[1.7.2.2],
link:RelNotes/1.7.2.1.txt[1.7.2.1],
link:RelNotes/1.7.2.txt[1.7.2].
* link:v1.7.1.2/git.html[documentation for release 1.7.1.2]
* link:v1.7.1.3/git.html[documentation for release 1.7.1.3]
* release notes for
link:RelNotes/1.7.1.3.txt[1.7.1.3],
link:RelNotes/1.7.1.2.txt[1.7.1.2],
link:RelNotes/1.7.1.1.txt[1.7.1.1],
link:RelNotes/1.7.1.txt[1.7.1].
* link:v1.7.0.7/git.html[documentation for release 1.7.0.7]
* link:v1.7.0.8/git.html[documentation for release 1.7.0.8]
* release notes for
link:RelNotes/1.7.0.8.txt[1.7.0.8],
link:RelNotes/1.7.0.7.txt[1.7.0.7],
link:RelNotes/1.7.0.6.txt[1.7.0.6],
link:RelNotes/1.7.0.5.txt[1.7.0.5],

15
git-svn.perl
View File

@@ -84,7 +84,7 @@ my ($_stdin, $_help, $_edit,
$_version, $_fetch_all, $_no_rebase, $_fetch_parent,
$_merge, $_strategy, $_dry_run, $_local,
$_prefix, $_no_checkout, $_url, $_verbose,
$_git_format, $_commit_url, $_tag);
$_git_format, $_commit_url, $_tag, $_merge_info);
$Git::SVN::_follow_parent = 1;
$_q ||= 0;
my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
@@ -154,6 +154,7 @@ my %cmd = (
'commit-url=s' => \$_commit_url,
'revision|r=i' => \$_revision,
'no-rebase' => \$_no_rebase,
'mergeinfo=s' => \$_merge_info,
%cmt_opts, %fc_opts } ],
branch => [ \&cmd_branch,
'Create a branch in the SVN repository',
@@ -569,6 +570,7 @@ sub cmd_dcommit {
print "Committed r$_[0]\n";
$cmt_rev = $_[0];
},
mergeinfo => $_merge_info,
svn_path => '');
if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {
print "No changes\n$d~1 == $d\n";
@@ -4451,6 +4453,7 @@ sub new {
$self->{path_prefix} = length $self->{svn_path} ?
"$self->{svn_path}/" : '';
$self->{config} = $opts->{config};
$self->{mergeinfo} = $opts->{mergeinfo};
return $self;
}
@@ -4760,6 +4763,11 @@ sub change_file_prop {
$self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
}
sub change_dir_prop {
my ($self, $pbat, $pname, $pval) = @_;
$self->SUPER::change_dir_prop($pbat, $pname, $pval, $self->{pool});
}
sub _chg_file_get_blob ($$$$) {
my ($self, $fbat, $m, $which) = @_;
my $fh = $::_repository->temp_acquire("git_blob_$which");
@@ -4853,6 +4861,11 @@ sub apply_diff {
fatal("Invalid change type: $f");
}
}
if (defined($self->{mergeinfo})) {
$self->change_dir_prop($self->{bat}{''}, "svn:mergeinfo",
$self->{mergeinfo});
}
$self->rmdirs if $_rmdir;
if (@$mods == 0) {
$self->abort_edit;

4
t/t9143-git-svn-gc.sh
View File

@@ -37,13 +37,11 @@ test_expect_success 'git svn gc runs' 'git svn gc'
test_expect_success 'git svn index removed' '! test -f .git/svn/refs/remotes/git-svn/index'
if perl -MCompress::Zlib -e 0 2>/dev/null
if test -r .git/svn/refs/remotes/git-svn/unhandled.log.gz
then
test_expect_success 'git svn gc produces a valid gzip file' '
gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
'
else
say "# Perl Compress::Zlib unavailable, skipping gunzip test"
fi
test_expect_success 'git svn gc does not change unhandled.log files' '

41
t/t9158-git-svn-mergeinfo.sh Normal file
View File

@@ -0,0 +1,41 @@
#!/bin/sh
#
# Copyright (c) 2010 Steven Walter
#
test_description='git svn mergeinfo propagation'
. ./lib-git-svn.sh
say 'define NO_SVN_TESTS to skip git svn tests'
test_expect_success 'initialize source svn repo' '
svn_cmd mkdir -m x "$svnrepo"/trunk &&
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
(
cd "$SVN_TREE" &&
touch foo &&
svn_cmd add foo &&
svn_cmd commit -m "initial commit"
) &&
rm -rf "$SVN_TREE"
'
test_expect_success 'clone svn repo' '
git svn init "$svnrepo"/trunk &&
git svn fetch
'
test_expect_success 'change svn:mergeinfo' '
touch bar &&
git add bar &&
git commit -m "bar" &&
git svn dcommit --mergeinfo="/branches/foo:1-10"
'
test_expect_success 'verify svn:mergeinfo' '
mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)
test "$mergeinfo" = "/branches/foo:1-10"
'
test_done