summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 991255c)
raw | patch | inline | side by side (parent: 991255c)
author | Thomas Rast <trast@student.ethz.ch> | |
Sun, 31 Aug 2008 13:50:59 +0000 (15:50 +0200) | ||
committer | Eric Wong <normalperson@yhbt.net> | |
Fri, 5 Sep 2008 23:58:39 +0000 (16:58 -0700) |
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>
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>
git-svn.perl | patch | blob | history |
diff --git a/git-svn.perl b/git-svn.perl
index 2d355c183439238cd3dccda49f01bae3c19f932f..484b4ab0da9fd907645e84559a6847b954997165 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
$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 ",