From: Junio C Hamano <junkio@cox.net>
Date: Wed, 11 Jan 2006 21:41:25 +0000 (-0800)
Subject: describe: do not silently ignore indescribable commits
X-Git-Tag: v1.1.2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8c23b6fae2e5cd8475885b015f0bb992d19921db;p=git.git

describe: do not silently ignore indescribable commits

We silently ignored indescribable commits without complaining.
Complain and die instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/describe.c b/describe.c
index a0180f548..5548a16e4 100644
--- a/describe.c
+++ b/describe.c
@@ -124,10 +124,11 @@ static void describe(struct commit *cmit)
 		if (n) {
 			printf("%s-g%s\n", n->path,
 			       find_unique_abbrev(cmit->object.sha1, abbrev));
-			break;
+			clear_commit_marks(cmit, SEEN);
+			return;
 		}
 	}
-	clear_commit_marks(cmit, SEEN);
+	die("cannot describe '%s'", sha1_to_hex(cmit->object.sha1));
 }
 
 int main(int argc, char **argv)