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

From

Thomas Rast <trast@student.ethz.ch>

Date

Aug 31, 2008, 13:50 UTC

Message-ID

<1220190659-5955-1-git-send-email-trast@student.ethz.ch>

In-Reply-To

<c7d83d0d0808310029s15c1413m49cad5c68a568271@mail.gmail.com>

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---

Weyert de Boer wrote:

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

 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