diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-13 16:51:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-13 16:51:21 -0800 |
| commit | 429608fc365d4e6e0db9dee72a0b103dce578722 (patch) | |
| tree | 2d4488d7bdeae0afab713557f7edfd888c973e68 /describe.c | |
| parent | b42934d611054400de86e559577b421677b3f1ae (diff) | |
| parent | 59617ebb746b67921856c00a63f943d43b0abeea (diff) | |
| download | git-429608fc365d4e6e0db9dee72a0b103dce578722.tar.gz git-429608fc365d4e6e0db9dee72a0b103dce578722.tar.xz | |
Merge fixes up to GIT 1.1.2
Diffstat (limited to 'describe.c')
| -rw-r--r-- | describe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/describe.c b/describe.c index 1e764026b..fabadb827 100644 --- a/describe.c +++ b/describe.c @@ -132,10 +132,11 @@ static void describe(char *arg) 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) |