Skip to content
Browse files

Merge branch 'jk/push-delete-ref-error-message'

The error message from "git push $there :bogo" mentioned we tried
and failed to guess what ref is being deleted based on the LHS of
the refspec, which we don't.

# By Jeff King
* jk/push-delete-ref-error-message:
  push: don't guess at qualifying remote refs on deletion
  • Loading branch information...
2 parents 48c42ff + 5742c82 commit f06d47e7e0d9db709ee204ed13a8a7486149f494 @gitster gitster committed
Showing with 3 additions and 0 deletions.
  1. +3 −0 remote.c
View
3 remote.c
@@ -1100,6 +1100,9 @@ static int match_explicit(struct ref *src, struct ref *dst,
case 0:
if (!memcmp(dst_value, "refs/", 5))
matched_dst = make_linked_ref(dst_value, dst_tail);
+ else if (is_null_sha1(matched_src->new_sha1))
+ error("unable to delete '%s': remote ref does not exist",
+ dst_value);
else if ((dst_guess = guess_ref(dst_value, matched_src)))
matched_dst = make_linked_ref(dst_guess, dst_tail);
else

0 comments on commit f06d47e

Please sign in to comment.
Something went wrong with that request. Please try again.