git-svn: don't die on rebuild when --upgrade is specified
--copy-remote and --upgrade are rarely (never?) used together, so if --copy-remote is specified, that means the user really wanted to copy the remote ref, and we should fail if that fails. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong committed
Nov 4, 2006 at 21:51 UTC
b2e2ddfed8006590bc5b8f4f2a22046891958f28
1 file changed
+1
-1
git-svn.perl
+1
-1
@@ -3139,7 +3139,7 @@ sub copy_remote_ref {
3139
my $ref = "refs/remotes/$GIT_SVN";
3140
if (safe_qx('git-ls-remote', $origin, $ref)) {
3141
sys(qw/git fetch/, $origin, "$ref:$ref");
3142
- } else {
3142
+ } elsif ($_cp_remote && !$_upgrade) {
3143
die "Unable to find remote reference: ",
3144
"refs/remotes/$GIT_SVN on $origin\n";
3145
}