Problems with using git svn dcommit

3 messages, 3 authors, 2016-06-15 · open the first message on its own page

Problems with using git svn dcommit

From: Weyert de Boer <hidden>
Date: 2016-06-15 22:45:16

I have initialized a GIT repository for using a subversion repository
hosted at beanstalk.com. Only I have problems with it. Each time I try
to trigger GIT SVN DCOMMIT. I am getting the following error message:

Can't call method "full_url" on an undefined value at
/opt/local/libexec/git-core/git-svn line 425.

Really strange on other repos it's working fine. Anyone might know
what could cause this?

Here you can find some output:
http://www.dustyfrog.nl/dropbox/git-svn-1.txt
http://www.dustyfrog.nl/dropbox/git-svn-2.txt

I am currently using GIT 1.6.0.1 on MacOSX 10.5.4 installed via MacPorts

[PATCH] git svn: catch lack of upstream info for dcommit earlier

From: Thomas Rast <hidden>
Date: 2016-06-15 22:45:16

Since 711521e 'git svn dcommit' attempts to use the upstream
information to determine the SVN URL, before it verifies that it even
found an upstream.  Move up the corresponding check.

Signed-off-by: Thomas Rast <redacted>
---

Weyert de Boer wrote:
Can't call method "full_url" on an undefined value at
/opt/local/libexec/git-core/git-svn line 425.
After resolving the problem on IRC, here's the fix to avoid the
unhelpful message.


 git-svn.perl |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 7a1d26d..43bf201 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -421,15 +421,15 @@ sub cmd_dcommit {
 	$head ||= 'HEAD';
 	my @refs;
 	my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
+	unless ($gs) {
+		die "Unable to determine upstream SVN information from ",
+		    "$head history.\nPerhaps the repository is empty.";
+	}
 	$url = defined $_commit_url ? $_commit_url : $gs->full_url;
 	my $last_rev = $_revision if defined $_revision;
 	if ($url) {
 		print "Committing to $url ...\n";
 	}
-	unless ($gs) {
-		die "Unable to determine upstream SVN information from ",
-		    "$head history.\nPerhaps the repository is empty.";
-	}
 	my ($linear_refs, $parents) = linearize_history($gs, \@refs);
 	if ($_no_rebase && scalar(@$linear_refs) > 1) {
 		warn "Attempting to commit more than one change while ",
-- 
1.6.0.1.278.g5a622

Re: [PATCH] git svn: catch lack of upstream info for dcommit earlier

From: Eric Wong <hidden>
Date: 2016-06-15 22:45:16

Thomas Rast [off-list ref] wrote:
Since 711521e 'git svn dcommit' attempts to use the upstream
information to determine the SVN URL, before it verifies that it even
found an upstream.  Move up the corresponding check.

Signed-off-by: Thomas Rast <redacted>
Thanks,

Acked-by: Eric Wong <redacted>
quoted hunk
---

Weyert de Boer wrote:
quoted
Can't call method "full_url" on an undefined value at
/opt/local/libexec/git-core/git-svn line 425.
After resolving the problem on IRC, here's the fix to avoid the
unhelpful message.


 git-svn.perl |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 7a1d26d..43bf201 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -421,15 +421,15 @@ sub cmd_dcommit {
 	$head ||= 'HEAD';
 	my @refs;
 	my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
+	unless ($gs) {
+		die "Unable to determine upstream SVN information from ",
+		    "$head history.\nPerhaps the repository is empty.";
+	}
 	$url = defined $_commit_url ? $_commit_url : $gs->full_url;
 	my $last_rev = $_revision if defined $_revision;
 	if ($url) {
 		print "Committing to $url ...\n";
 	}
-	unless ($gs) {
-		die "Unable to determine upstream SVN information from ",
-		    "$head history.\nPerhaps the repository is empty.";
-	}
 	my ($linear_refs, $parents) = linearize_history($gs, \@refs);
 	if ($_no_rebase && scalar(@$linear_refs) > 1) {
 		warn "Attempting to commit more than one change while ",
-- 
1.6.0.1.278.g5a622
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help