From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 5 Nov 2006 05:51:11 +0000 (-0800)
Subject: git-svn: don't die on rebuild when --upgrade is specified
X-Git-Tag: v1.4.4-rc1~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b2e2ddfed8006590bc5b8f4f2a22046891958f28;p=git.git

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>
---

diff --git a/git-svn.perl b/git-svn.perl
index cc3335a53..4a56f1871 100755
--- 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";
 	}