The commit url is determined in the following order
--commit-url commandline
svn-remote.<name>.dcommiturl
svn-remote.<name>.url
Signed-off-by: Peter Oberndorfer <kumbayo84@xxxxxxxx>
---
I find it really boring to always specify --commit-url on the git svn dcommit command line.
And it tends to fall out of my bash_history since i do not commit often.
Setting up the commit url 1 time should be enough.
I feel that the config key: part im the documentation should get more exposure or explanation.
Maybe somebody can suggest some wording?
Also the dcommiturl name is still a suggestion
My kdelibs git-svn config file no looks like this:
[svn-remote "svn"]
url = svn://anonsvn.kde.org/home/kde/trunk/KDE/kdelibs
fetch = :refs/remotes/git-svn
dcommiturl = svn+ssh://username@xxxxxxxxxxx/home/kde/trunk/KDE/kdelibs
Documentation/git-svn.txt | 2 ++
git-svn.perl | 12 +++++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 3d45654..0d11428 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -169,6 +169,8 @@ and have no uncommitted changes.
reused if a user is later given access to an alternate transport
method (e.g. `svn+ssh://` or `https://`) for commit.
+config key: svn-remote.<name>.dcommiturl
+
Using this option for any other purpose (don't ask)
is very strongly discouraged.
--
diff --git a/git-svn.perl b/git-svn.perl
index 83cb36f..2ad3603 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -438,7 +438,17 @@ sub cmd_dcommit {
die "Unable to determine upstream SVN information from ",
"$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}.dcommiturl") };
+ if (!$url) {
+ $url = $gs->full_url
+ }
+ }
+
my $last_rev = $_revision if defined $_revision;
if ($url) {
print "Committing to $url ...\n";
--
1.6.1.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
