From: Mark Lodato Date: Sat, 13 Mar 2010 04:52:57 GMT Subject: [PATCH/RFC 05/12] docs: differentiate between and Message-ID: <1268455984-19061-6-git-send-email-lodatom@gmail.com> In-Reply-To: <1268455984-19061-1-git-send-email-lodatom@gmail.com> In the documentation and user messages, differentiate between , which means an actual annotated tag object, and , which is a revision specifier for refs/tags/. Signed-off-by: Mark Lodato --- A similar thing should be done for vs vs . The term is not used anywhere to mean what it does in git(1); instead, it is used as a more descriptive term for . The term is used for what git(1) describes as , but the term is also used, and I'm not sure what it means. I'll have to look into this. Documentation/git-push.txt | 2 +- Documentation/git.txt | 8 ++++++-- Documentation/pull-fetch-param.txt | 2 +- builtin/push.c | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 49b6bd9..5445443 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -55,7 +55,7 @@ you can tell git to update the ref even when the update is not a fast-forward. This does *not* attempt to merge into . See EXAMPLES below for details. + -`tag ` means the same as `refs/tags/:refs/tags/`. +`tag ` means the same as `refs/tags/:refs/tags/`. + Pushing an empty allows you to delete the ref from the remote repository. diff --git a/Documentation/git.txt b/Documentation/git.txt index a635281..f06e4de 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -420,6 +420,10 @@ Identifier Terminology :: Indicates the object name for any type of object. +:: + Indicates a tag object name. This is an annotated tag object, as + opposed to , which can refer to any type of object. + :: Indicates a blob object name. @@ -458,9 +462,9 @@ HEAD:: indicates the head of the current branch (i.e. the contents of `$GIT_DIR/HEAD`). -:: +:: a valid tag 'name' - (i.e. the contents of `$GIT_DIR/refs/tags/`). + (i.e. the contents of `$GIT_DIR/refs/tags/`). :: a valid head 'name' diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 5dd6e5a..3a947b3 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -66,7 +66,7 @@ is often useful. + Some short-cut notations are also supported. + -* `tag ` means the same as `refs/tags/:refs/tags/`; +* `tag ` means the same as `refs/tags/:refs/tags/`; it requests fetching everything up to the given tag. * A parameter without a colon is equivalent to : when pulling/fetching, so it merges into the current diff --git a/builtin/push.c b/builtin/push.c index f7bc2b2..4227a8e 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -38,7 +38,7 @@ static void set_refspecs(const char **refs, int nr) char *tag; int len; if (nr <= ++i) - die("tag shorthand without "); + die("tag shorthand without "); len = strlen(refs[i]) + 11; if (deleterefs) { tag = xmalloc(len+1); -- 1.7.0.2