git-svn: read the dcommit url from the config file on a per remote basis
The commit url for dcommit is determined in the following order: commandline option --commit-url svn.commiturl svn-remote.<name>.commiturl svn-remote.<name>.url Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de> Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
parent
83c2fcff21
commit
0df84059d4
@ -169,6 +169,10 @@ and have no uncommitted changes.
|
|||||||
reused if a user is later given access to an alternate transport
|
reused if a user is later given access to an alternate transport
|
||||||
method (e.g. `svn+ssh://` or `https://`) for commit.
|
method (e.g. `svn+ssh://` or `https://`) for commit.
|
||||||
|
|
||||||
|
config key: svn-remote.<name>.commiturl
|
||||||
|
|
||||||
|
config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)
|
||||||
|
|
||||||
Using this option for any other purpose (don't ask)
|
Using this option for any other purpose (don't ask)
|
||||||
is very strongly discouraged.
|
is very strongly discouraged.
|
||||||
--
|
--
|
||||||
|
12
git-svn.perl
12
git-svn.perl
@ -438,7 +438,17 @@ sub cmd_dcommit {
|
|||||||
die "Unable to determine upstream SVN information from ",
|
die "Unable to determine upstream SVN information from ",
|
||||||
"$head history.\nPerhaps the repository is empty.";
|
"$head history.\nPerhaps the repository is empty.";
|
||||||
}
|
}
|
||||||
$url = defined $_commit_url ? $_commit_url : $gs->full_url;
|
|
||||||
|
if (defined $_commit_url) {
|
||||||
|
$url = $_commit_url;
|
||||||
|
} else {
|
||||||
|
$url = eval { command_oneline('config', '--get',
|
||||||
|
"svn-remote.$gs->{repo_id}.commiturl") };
|
||||||
|
if (!$url) {
|
||||||
|
$url = $gs->full_url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
my $last_rev = $_revision if defined $_revision;
|
my $last_rev = $_revision if defined $_revision;
|
||||||
if ($url) {
|
if ($url) {
|
||||||
print "Committing to $url ...\n";
|
print "Committing to $url ...\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user