git-svn: don't die on rebuild when --upgrade is specified

Eric Wong · Junio C Hamano · commit b2e2ddfed800 · 2006-11-04T23:33:21.000-08:00
--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 &lt;normalperson@yhbt.net&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/git-svn.perl b/git-svn.perl
@@ -3139,7 +3139,7 @@ sub copy_remote_ref {
 	my $ref = "refs/remotes/$GIT_SVN";
 	if (safe_qx('git-ls-remote', $origin, $ref)) {
 		sys(qw/git fetch/, $origin, "$ref:$ref");
-	} else {
+	} elsif ($_cp_remote && !$_upgrade) {
 		die "Unable to find remote reference: ",
 				"refs/remotes/$GIT_SVN on $origin\n";
 	}

Original file line number	Diff line number	Diff line change
`@@ -3139,7 +3139,7 @@ sub copy_remote_ref {`
`3139`	`3139`	`my $ref = "refs/remotes/$GIT_SVN";`
`3140`	`3140`	`if (safe_qx('git-ls-remote', $origin, $ref)) {`
`3141`	`3141`	`sys(qw/git fetch/, $origin, "$ref:$ref");`
`3142`		`- } else {`
	`3142`	`+ } elsif ($_cp_remote && !$_upgrade) {`
`3143`	`3143`	`die "Unable to find remote reference: ",`
`3144`	`3144`	`"refs/remotes/$GIT_SVN on $origin\n";`
`3145`	`3145`	`}`