undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.bogomips.org/git-svn

Browse Source 
* 'master' of git://git.bogomips.org/git-svn:
  git-svn: allow --version to work anywhere
  git-svn: document svn.authorsProg in config
This commit is contained in:
Junio C Hamano 2016-07-28 13:13:53 -07:00
commit 0f3d855efc
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-svn.txt
View File

@ -625,6 +625,9 @@ config key: svn.authorsfile
with the committer name as the first argument. The program is with the committer name as the first argument. The program is
expected to return a single line of the form "Name <email>", expected to return a single line of the form "Name <email>",
which will be treated as if included in the authors file. which will be treated as if included in the authors file.
+
[verse]
config key: svn.authorsProg
-q:: -q::
--quiet:: --quiet::

4
git-svn.perl
View File

@ -339,7 +339,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
die "failed to open $ENV{GIT_DIR}: $!\n"; die "failed to open $ENV{GIT_DIR}: $!\n";
$ENV{GIT_DIR} = $1 if <$fh> =~ /^gitdir: (.+)$/; $ENV{GIT_DIR} = $1 if <$fh> =~ /^gitdir: (.+)$/;
} }
} else { } elsif ($cmd) {
my ($git_dir, $cdup); my ($git_dir, $cdup);
git_cmd_try { git_cmd_try {
$git_dir = command_oneline([qw/rev-parse --git-dir/]); $git_dir = command_oneline([qw/rev-parse --git-dir/]);
@ -356,7 +356,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd); my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
read_git_config(\%opts); read_git_config(\%opts) if $ENV{GIT_DIR};
if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) { if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
Getopt::Long::Configure('pass_through'); Getopt::Long::Configure('pass_through');
} }

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

@ -19,6 +19,25 @@ case "$GIT_SVN_LC_ALL" in
;; ;;
esac esac
deepdir=nothing-above
ceiling=$PWD
test_expect_success 'git svn --version works anywhere' '
mkdir -p "$deepdir" && (
export GIT_CEILING_DIRECTORIES="$ceiling" &&
cd "$deepdir" &&
git svn --version
)
'
test_expect_success 'git svn help works anywhere' '
mkdir -p "$deepdir" && (
export GIT_CEILING_DIRECTORIES="$ceiling" &&
cd "$deepdir" &&
git svn help
)
'
test_expect_success \ test_expect_success \
'initialize git svn' ' 'initialize git svn' '
mkdir import && mkdir import &&