undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
--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:
Eric Wong 2006-11-04 21:51:11 -08:00 committed by Junio C Hamano
parent 98526e007e
commit b2e2ddfed8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-svn.perl
View File

@ -3139,7 +3139,7 @@ sub copy_remote_ref {
my $ref = "refs/remotes/$GIT_SVN"; my $ref = "refs/remotes/$GIT_SVN";
if (safe_qx('git-ls-remote', $origin, $ref)) { if (safe_qx('git-ls-remote', $origin, $ref)) {
sys(qw/git fetch/, $origin, "$ref:$ref"); sys(qw/git fetch/, $origin, "$ref:$ref");
} else { } elsif ($_cp_remote && !$_upgrade) {
die "Unable to find remote reference: ", die "Unable to find remote reference: ",
"refs/remotes/$GIT_SVN on $origin\n"; "refs/remotes/$GIT_SVN on $origin\n";
} }