diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-11-04 21:51:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-04 23:33:21 -0800 |
| commit | b2e2ddfed8006590bc5b8f4f2a22046891958f28 (patch) | |
| tree | d7645dcefe92cf0100fe4452a14137da00eb4e9d | |
| parent | 98526e007e293700fa578da9a0a4459d6b5375b0 (diff) | |
| download | git-b2e2ddfed8006590bc5b8f4f2a22046891958f28.tar.gz | |
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>
| -rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index cc3335a53f..4a56f1871a 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"; } |