diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2008-08-31 15:50:59 +0200 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-05 16:58:39 -0700 |
| commit | 2cb611054a9597a00e9387c77e75d82e78982e60 (patch) | |
| tree | c55126870c644df2aa78cf00dab07076c117a092 | |
| parent | 991255c634500fe51a70aae6a8e7c8d7b73db0cc (diff) | |
| download | git-2cb611054a9597a00e9387c77e75d82e78982e60.tar.gz | |
git svn: catch lack of upstream info for dcommit earlier
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 <trast@student.ethz.ch>
Acked-by: Eric Wong <normalperson@yhbt.net>
| -rwxr-xr-x | git-svn.perl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-svn.perl b/git-svn.perl index 2d355c1834..484b4ab0da 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 ", |