Skip to content

Commit

Permalink
Fix ".git/refs" stragglers
Browse files Browse the repository at this point in the history
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 <price@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Greg Price authored and Junio C Hamano committed Feb 25, 2013
1 parent dff9f88 commit 48dfe96
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 5 additions & 4 deletions Documentation/gitcli.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,14 @@ couple of magic command line options:
---------------------------------------------
$ git describe -h
usage: git describe [options] <committish>*
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 [<n>] use <n> digits to display SHA-1s
--candidates <n> consider <n> most recent tags (default: 10)
--all use any ref
--tags use any tag, even unannotated
--long always use long format
--abbrev[=<n>] use <n> digits to display SHA-1s
---------------------------------------------

--help-all::
Expand Down
4 changes: 2 additions & 2 deletions builtin/describe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 48dfe96

Please sign in to comment.