When checking what ref the source refspec matches, we have no
business setting the default for the destination, so move that
code lower. Also simplify the result from the code block that
matches the source side by making it set matched_src only upon
unambiguous match.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
if (rs->pattern)
return errs;
if (rs->pattern)
return errs;
- if (dst_value == NULL)
- dst_value = rs->src;
-
matched_src = matched_dst = NULL;
switch (count_refspec_match(rs->src, src, &matched_src)) {
case 1:
matched_src = matched_dst = NULL;
switch (count_refspec_match(rs->src, src, &matched_src)) {
case 1:
matched_src = try_explicit_object_name(rs->src);
if (matched_src)
break;
matched_src = try_explicit_object_name(rs->src);
if (matched_src)
break;
error("src refspec %s does not match any.",
rs->src);
break;
default:
error("src refspec %s does not match any.",
rs->src);
break;
default:
error("src refspec %s matches more than one.",
rs->src);
break;
}
error("src refspec %s matches more than one.",
rs->src);
break;
}
+
+ if (!matched_src)
+ errs = 1;
+
+ if (dst_value == NULL)
+ dst_value = rs->src;
+
switch (count_refspec_match(dst_value, dst, &matched_dst)) {
case 1:
break;
switch (count_refspec_match(dst_value, dst, &matched_dst)) {
case 1:
break;
* remote does not have master yet.
*/
matched_dst = make_dst(matched_src->name, dst_tail);
* remote does not have master yet.
*/
matched_dst = make_dst(matched_src->name, dst_tail);
error("dst refspec %s does not match any "
"existing ref on the remote and does "
"not start with refs/.", dst_value);
error("dst refspec %s does not match any "
"existing ref on the remote and does "
"not start with refs/.", dst_value);
error("dst refspec %s matches more than one.",
dst_value);
break;
}
error("dst refspec %s matches more than one.",
dst_value);
break;
}
- if (errs)
- return errs;
+ if (errs || matched_dst == NULL)
+ return 1;
if (matched_dst->peer_ref) {
errs = 1;
error("dst ref %s receives from more than one src.",
if (matched_dst->peer_ref) {
errs = 1;
error("dst ref %s receives from more than one src.",