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>
This commit is contained in:
parent
75bd7e374e
commit
a35a045874
@ -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";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user