From 48dfe969fc703f1f77f8944bbef033e58b815634 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 25 Feb 2013 00:34:14 -0500 Subject: [PATCH] Fix ".git/refs" stragglers A couple of references still survive to .git/refs as a tree of all refs. Fix one in docs, one in a -h message, one in a -h message quoted in docs. Signed-off-by: Greg Price Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- Documentation/gitcli.txt | 9 +++++---- builtin/describe.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index e452ff89ba..91f37be127 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -423,7 +423,7 @@ core.sharedRepository:: core.warnAmbiguousRefs:: If true, git will warn you if the ref name you passed it is ambiguous - and might match multiple refs in the .git/refs/ tree. True by default. + and might match multiple refs in the repository. True by default. core.compression:: An integer -1..9, indicating a default compression level. diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 3bc1500eda..d59a5ad1ac 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -107,13 +107,14 @@ couple of magic command line options: --------------------------------------------- $ git describe -h usage: git describe [options] * + or: git describe [options] --dirty --contains find the tag that comes after the commit --debug debug search strategy on stderr - --all use any ref in .git/refs - --tags use any tag in .git/refs/tags - --abbrev [] use digits to display SHA-1s - --candidates consider most recent tags (default: 10) + --all use any ref + --tags use any tag, even unannotated + --long always use long format + --abbrev[=] use digits to display SHA-1s --------------------------------------------- --help-all:: diff --git a/builtin/describe.c b/builtin/describe.c index 04c185b1fb..ca084c675e 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -402,8 +402,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_BOOLEAN(0, "contains", &contains, N_("find the tag that comes after the commit")), OPT_BOOLEAN(0, "debug", &debug, N_("debug search strategy on stderr")), - OPT_BOOLEAN(0, "all", &all, N_("use any ref in .git/refs")), - OPT_BOOLEAN(0, "tags", &tags, N_("use any tag in .git/refs/tags")), + OPT_BOOLEAN(0, "all", &all, N_("use any ref")), + OPT_BOOLEAN(0, "tags", &tags, N_("use any tag, even unannotated")), OPT_BOOLEAN(0, "long", &longformat, N_("always use long format")), OPT__ABBREV(&abbrev), OPT_SET_INT(0, "exact-match", &max_candidates, -- 2.11.4.GIT