{"thread":{"id":"33002","subject":"[PATCH] Fix \".git/refs\" stragglers","startedAt":"2013-02-25T05:34:14Z","lastAt":"2013-02-25T05:34:14Z","messageCount":1,"participants":["Greg Price"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"210220","messageId":"20130225053414.GJ5688@biohazard-cafe.mit.edu","threadId":"33002","inReplyTo":null,"subject":"[PATCH] Fix \".git/refs\" stragglers","fromName":"Greg Price","fromEmail":"price@mit.edu","sentAt":"2013-02-25T05:34:14Z","receivedAt":"2013-02-25T05:34:14Z","isPatch":true,"sender":{"key":"price@mit.edu","avatar":"https://avatars.githubusercontent.com/u/28173?v=4"},"body":"A couple of references still survive to .git/refs as a tree\nof all refs.  Fix one in docs, one in a -h message, one in\na -h message quoted in docs.\n\nSigned-off-by: Greg Price <price@mit.edu>\n---\n Documentation/config.txt | 2 +-\n Documentation/gitcli.txt | 9 +++++----\n builtin/describe.c       | 4 ++--\n 3 files changed, 8 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex dbb2faf..6eb013a 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -423,7 +423,7 @@ core.sharedRepository::\n \n core.warnAmbiguousRefs::\n \tIf true, git will warn you if the ref name you passed it is ambiguous\n-\tand might match multiple refs in the .git/refs/ tree. True by default.\n+\tand might match multiple refs in the repository. True by default.\n \n core.compression::\n \tAn integer -1..9, indicating a default compression level.\ndiff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\nindex 3bc1500..d59a5ad 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/gitcli.txt\n@@ -107,13 +107,14 @@ couple of magic command line options:\n ---------------------------------------------\n $ git describe -h\n usage: git describe [options] <committish>*\n+   or: git describe [options] --dirty\n \n     --contains            find the tag that comes after the commit\n     --debug               debug search strategy on stderr\n-    --all                 use any ref in .git/refs\n-    --tags                use any tag in .git/refs/tags\n-    --abbrev [<n>]        use <n> digits to display SHA-1s\n-    --candidates <n>      consider <n> most recent tags (default: 10)\n+    --all                 use any ref\n+    --tags                use any tag, even unannotated\n+    --long                always use long format\n+    --abbrev[=<n>]        use <n> digits to display SHA-1s\n ---------------------------------------------\n \n --help-all::\ndiff --git a/builtin/describe.c b/builtin/describe.c\nindex 90a72af..2ef3f10 100644\n--- a/builtin/describe.c\n+++ b/builtin/describe.c\n@@ -402,8 +402,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)\n \tstruct option options[] = {\n \t\tOPT_BOOLEAN(0, \"contains\",   &contains, N_(\"find the tag that comes after the commit\")),\n \t\tOPT_BOOLEAN(0, \"debug\",      &debug, N_(\"debug search strategy on stderr\")),\n-\t\tOPT_BOOLEAN(0, \"all\",        &all, N_(\"use any ref in .git/refs\")),\n-\t\tOPT_BOOLEAN(0, \"tags\",       &tags, N_(\"use any tag in .git/refs/tags\")),\n+\t\tOPT_BOOLEAN(0, \"all\",        &all, N_(\"use any ref\")),\n+\t\tOPT_BOOLEAN(0, \"tags\",       &tags, N_(\"use any tag, even unannotated\")),\n \t\tOPT_BOOLEAN(0, \"long\",       &longformat, N_(\"always use long format\")),\n \t\tOPT__ABBREV(&abbrev),\n \t\tOPT_SET_INT(0, \"exact-match\", &max_candidates,\n-- \n1.7.11.3\n"}]}