From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Mar 2008 23:02:56 +0000 (-0800)
Subject: Merge branch 'sb/describe-long'
X-Git-Tag: v1.5.5-rc0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c42f63671c0f09cba0c8247c4d1d8121f37798fe;p=thirdparty%2Fgit.git

Merge branch 'sb/describe-long'

* sb/describe-long:
  git-describe: --long shows the object name even for a tagged commit
---

c42f63671c0f09cba0c8247c4d1d8121f37798fe
diff --cc builtin-describe.c
index 05e309f5ad,3fd2e7371f..2342913df6
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@@ -271,9 -259,8 +276,10 @@@ int cmd_describe(int argc, const char *
  		OPT_BOOLEAN(0, "debug",      &debug, "debug search strategy on stderr"),
  		OPT_BOOLEAN(0, "all",        &all, "use any ref in .git/refs"),
  		OPT_BOOLEAN(0, "tags",       &tags, "use any tag in .git/refs/tags"),
+ 		OPT_BOOLEAN(0, "long",       &longformat, "always use long format"),
  		OPT__ABBREV(&abbrev),
 +		OPT_SET_INT(0, "exact-match", &max_candidates,
 +			    "only output exact matches", 0),
  		OPT_INTEGER(0, "candidates", &max_candidates,
  			    "consider <n> most recent tags (default: 10)"),
  		OPT_STRING(0, "match",       &pattern, "pattern",