summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-06-19 19:05:00 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-06-19 19:05:00 +0000
commit8b21e9058c94f20aab2dd1fea717d9ce468b8efd (patch)
treecd57444543871cf21f5410ceaff6eeb555e0f961
parent1179c305ed0961619a7d5da9be4504bed3b2b0d0 (diff)
If checkout/update -p is requested with a specific tag for a file which
doesn't contain this tag, don't print head. ok joris
-rw-r--r--usr.bin/cvs/update.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index e4ef04e14b9..d9d34ced74e 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: update.c,v 1.154 2008/06/14 04:34:08 tobias Exp $ */
+/* $OpenBSD: update.c,v 1.155 2008/06/19 19:04:59 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -362,7 +362,8 @@ cvs_update_local(struct cvs_file *cf)
if (print_stdout) {
if (cf->file_status != FILE_UNKNOWN && cf->file_rcs != NULL &&
- cf->file_rcsrev != NULL && !cf->file_rcs->rf_dead) {
+ cf->file_rcsrev != NULL && !cf->file_rcs->rf_dead &&
+ (cf->file_flags & FILE_HAS_TAG)) {
rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf));
if (verbosity > 1) {
cvs_log(LP_RCS, RCS_DIFF_DIV);