summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2005-10-25 16:08:21 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2005-10-25 16:08:21 +0000
commit93d2d87dc7f95a2fa4f4eb9f5f0f0b03f2ab89c9 (patch)
tree45cf599da9734fb1c3aa6c381187d0bf0386b248 /usr.bin
parent090d9a3e2078dde036eef334d12ffdfdaca6c0af (diff)
missed that in previous commit;
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/rcs/rlog.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/rcs/rlog.c b/usr.bin/rcs/rlog.c
index 26c9433886f..072a359e20c 100644
--- a/usr.bin/rcs/rlog.c
+++ b/usr.bin/rcs/rlog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rlog.c,v 1.6 2005/10/24 16:14:15 xsa Exp $ */
+/* $OpenBSD: rlog.c,v 1.7 2005/10/25 16:08:20 xsa Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* All rights reserved.
@@ -91,8 +91,10 @@ rlog_main(int argc, char **argv)
exit(1);
}
- if ((hflag == 1) && (tflag == 1))
+ if ((hflag == 1) && (tflag == 1)) {
cvs_log(LP_WARN, "warning: -t overrides -h.");
+ hflag = 0;
+ }
for (i = 0; i < argc; i++) {
if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)