summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-25 05:09:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-25 07:28:50 (GMT)
commitb4cf8db27502f613fcff3fd871c8e31d23f49c7d (patch)
treefda81ba33bf50cdd858315f922ebd8ca4b5ecf16 /builtin/push.c
parent75e5c0dc5529aed42122b3a774e6b17383e51b66 (diff)
downloadgit-b4cf8db27502f613fcff3fd871c8e31d23f49c7d.zip
git-b4cf8db27502f613fcff3fd871c8e31d23f49c7d.tar.gz
git-b4cf8db27502f613fcff3fd871c8e31d23f49c7d.tar.bz2
push: finishing touches to explain REJECT_ALREADY_EXISTS better
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>
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/push.c b/builtin/push.c
index a2b3fbe..3963fbb 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -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"