mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint

Browse Source 
* gp/avoid-explicit-mention-of-dot-git-refs:
  Fix ".git/refs" stragglers
This commit is contained in:
Junio C Hamano
2013-03-26 12:40:04 -07:00
parent 1d66383579 48dfe969fc
commit c17866d7b6
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/describe.c
View File

@ -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,