summaryrefslogtreecommitdiff
path: root/describe.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-11 21:41:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-11 21:41:25 (GMT)
commit8c23b6fae2e5cd8475885b015f0bb992d19921db (patch)
tree82a9325583a19c0b0b3d51ea5b68c92f5b5fdb24 /describe.c
parent5a25b4a66e05376c629669ee7321c1ce7f6a47fb (diff)
downloadgit-8c23b6fae2e5cd8475885b015f0bb992d19921db.zip
git-8c23b6fae2e5cd8475885b015f0bb992d19921db.tar.gz
git-8c23b6fae2e5cd8475885b015f0bb992d19921db.tar.bz2
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>
Diffstat (limited to 'describe.c')
-rw-r--r--describe.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/describe.c b/describe.c
index a0180f5..5548a16 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)