diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-10-23 11:42:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-23 12:00:41 -0700 |
| commit | 024ab976fffdc1d78b6d0b15e261b52f3a5d594b (patch) | |
| tree | 7b87632a6e5d242fe175396740aa210954ad1269 | |
| parent | Document `delta` attribute in "git help attributes". (diff) | |
| download | tgif-024ab976fffdc1d78b6d0b15e261b52f3a5d594b.tar.xz | |
Do not fail "describe --always" in a tag-less repository
This fixes a regression introduce by d68dc34 (git-describe: Die early if
there are no possible descriptions, 2009-08-06).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-describe.c | 2 | ||||
| -rwxr-xr-x | t/t6120-describe.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin-describe.c b/builtin-describe.c index df67a733ae..7542b5705c 100644 --- a/builtin-describe.c +++ b/builtin-describe.c @@ -197,7 +197,7 @@ static void describe(const char *arg, int last_one) for_each_ref(get_name, NULL); } - if (!found_names) + if (!found_names && !always) die("cannot describe '%s'", sha1_to_hex(sha1)); n = cmit->util; diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 8c7e081c53..f5a1b615f6 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -34,6 +34,8 @@ test_expect_success setup ' echo one >file && git add file && git commit -m initial && one=$(git rev-parse HEAD) && + git describe --always HEAD && + test_tick && echo two >file && git add file && git commit -m second && two=$(git rev-parse HEAD) && |