summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/annotate.c
diff options
context:
space:
mode:
authortobias <tobias@openbsd.org>2008-02-03 16:59:11 +0000
committertobias <tobias@openbsd.org>2008-02-03 16:59:11 +0000
commitb03d8731fb14e2a071453b06a18abce8a35e73fe (patch)
tree4fce998f2e39244a813236e080be36a57ab42aef /usr.bin/cvs/annotate.c
parentLike i wrote in last commit, it's supposed to be sys/time.h, not sys/times.h. (diff)
downloadwireguard-openbsd-b03d8731fb14e2a071453b06a18abce8a35e73fe.tar.xz
wireguard-openbsd-b03d8731fb14e2a071453b06a18abce8a35e73fe.zip
Do not unify this "-fr UNKNOWN" handling, it breaks commands which have
to work fine and just ignore files which don't have requested symbol. Spotted by joris@.
Diffstat (limited to 'usr.bin/cvs/annotate.c')
-rw-r--r--usr.bin/cvs/annotate.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c
index 2e8c6cc9feb..7996d19ed0b 100644
--- a/usr.bin/cvs/annotate.c
+++ b/usr.bin/cvs/annotate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: annotate.c,v 1.49 2008/02/02 16:59:48 tobias Exp $ */
+/* $OpenBSD: annotate.c,v 1.50 2008/02/03 16:59:11 tobias Exp $ */
/*
* Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org>
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -161,6 +161,11 @@ cvs_annotate_local(struct cvs_file *cf)
/* Stick at weird GNU cvs, ignore error. */
return;
+ /* -f is not allowed for unknown symbols */
+ rev = rcsnum_parse(cvs_specified_tag);
+ if (rev == NULL)
+ fatal("no such tag %s", cvs_specified_tag);
+ rcsnum_free(rev);
rev = rcsnum_alloc();
rcsnum_cpy(cf->file_rcs->rf_head, rev, 0);
}