Skip to content

Commit

Permalink
push: finishing touches to explain REJECT_ALREADY_EXISTS better
Browse files Browse the repository at this point in the history
Now that "already exists" errors are given only when a push tries to
update an existing ref in refs/tags/ hierarchy, we can say "the
tag", instead of "the destination reference", and that is far easier
to understand.

Pointed out by Chris Rorvick.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Jan 25, 2013
1 parent 75e5c0d commit b4cf8db
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions builtin/push.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,7 @@ static const char message_advice_ref_fetch_first[] =
"See the 'Note about fast-forwards' in 'git push --help' for details.");

static const char message_advice_ref_already_exists[] =
N_("Updates were rejected because the destination reference already exists\n"
"in the remote.");
N_("Updates were rejected because the tag already exists in the remote.");

static const char message_advice_ref_needs_force[] =
N_("You cannot update a remote ref that points at a non-commit object,\n"
Expand Down

0 comments on commit b4cf8db

Please sign in to comment.