mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'master' of git://git.bogomips.org/git-svn
* '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:
commit
0f3d855efc
|
@ -625,6 +625,9 @@ config key: svn.authorsfile
|
|||
with the committer name as the first argument. The program is
|
||||
expected to return a single line of the form "Name <email>",
|
||||
which will be treated as if included in the authors file.
|
||||
+
|
||||
[verse]
|
||||
config key: svn.authorsProg
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
|
|
|
@ -339,7 +339,7 @@ sub term_init {
|
|||
die "failed to open $ENV{GIT_DIR}: $!\n";
|
||||
$ENV{GIT_DIR} = $1 if <$fh> =~ /^gitdir: (.+)$/;
|
||||
}
|
||||
} else {
|
||||
} elsif ($cmd) {
|
||||
my ($git_dir, $cdup);
|
||||
git_cmd_try {
|
||||
$git_dir = command_oneline([qw/rev-parse --git-dir/]);
|
||||
|
@ -356,7 +356,7 @@ sub term_init {
|
|||
|
||||
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')) {
|
||||
Getopt::Long::Configure('pass_through');
|
||||
}
|
||||
|
|
|
@ -19,6 +19,25 @@ case "$GIT_SVN_LC_ALL" in
|
|||
;;
|
||||
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 \
|
||||
'initialize git svn' '
|
||||
mkdir import &&
|
||||
|
|
Loading…
Reference in a new issue