summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-06-08 13:36:31 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-06-08 13:36:31 +0000
commitee05241691270f1ae40e071f28c08d4ed2eb8002 (patch)
tree19fd97b6ec4e08b8d6ef899346f87cc6e8f775cb /usr.bin/cvs
parent74601f66aeef0a10b10cf47f706f1aa8ba16db22 (diff)
rcs_translate_tag mustn't fatal() if it cannot resolve a tag. Breaks '-f'
in (r)annotate and (r)diff. ok joris
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/rcs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index 137773e2eb5..793e2296845 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.c,v 1.265 2008/05/22 07:57:58 joris Exp $ */
+/* $OpenBSD: rcs.c,v 1.266 2008/06/08 13:36:30 tobias Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -3494,7 +3494,7 @@ rcs_translate_tag(const char *revstr, RCSFILE *rfp)
return (NULL);
if ((rdp = rcs_findrev(rfp, rev)) == NULL)
- fatal("rcs_translate_tag: cannot find revision");
+ return (NULL);
/* let's see if we must follow a branch */
if (!strcmp(revstr, RCS_HEAD_BRANCH))