diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2006-05-30 22:06:14 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2006-05-30 22:06:14 +0000 |
| commit | 7c64d3e8bc5fd64282ed43449546709d46d85ab4 (patch) | |
| tree | d960f720d8ee2201c66d2661b1cf364c4ac7cd9f /usr.bin | |
| parent | 612dbbc6665a20b7082ce53b66dcaf58c62a59e5 (diff) | |
only look into the Attic for certain commands
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/file.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 310dd42faae..ecb5f5546d9 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.153 2006/05/30 21:32:52 joris Exp $ */ +/* $OpenBSD: file.c,v 1.154 2006/05/30 22:06:13 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -618,7 +618,8 @@ cvs_file_classify(struct cvs_file *cf, const char *tag, int loud) if (cf->file_rcs == NULL) fatal("cvs_file_classify: failed to parse RCS"); cf->file_rcs->rf_inattic = 0; - } else { + } else if (cvs_cmdop != CVS_OP_UPDATE && cvs_cmdop != CVS_OP_CHECKOUT + && cvs_cmdop != CVS_OP_COMMIT) { xfree(cf->file_rpath); l = snprintf(rcsfile, MAXPATHLEN, "%s/%s/%s%s", repo, CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT); @@ -637,7 +638,8 @@ cvs_file_classify(struct cvs_file *cf, const char *tag, int loud) } else { cf->file_rcs = NULL; } - } + } else + cf->file_rcs = NULL; if (tag != NULL && cf->file_rcs != NULL) cf->file_rcsrev = rcs_translate_tag(tag, cf->file_rcs); |