diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2006-05-27 15:17:43 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2006-05-27 15:17:43 +0000 |
| commit | 2ce4c8aaf0d6203ec4b881d046ca01918bd47e52 (patch) | |
| tree | d1300899e7a0b209ae78f21957044bc7eb885828 | |
| parent | acee4c87d6b95329534c06c617dd31f2158bf836 (diff) | |
show which directory we are examining in our pre-commit checks.
| -rw-r--r-- | usr.bin/cvs/commit.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index f8a2020b167..1e6c0eac2dd 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.58 2006/05/27 15:14:27 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.59 2006/05/27 15:17:42 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -115,6 +115,12 @@ cvs_commit_check_conflicts(struct cvs_file *cf) */ cvs_file_classify(cf); + if (cf->file_type == CVS_DIR) { + if (verbosity > 1) + cvs_log(LP_NOTICE, "Examining %s", cf->file_path); + return; + } + if (cf->file_status == FILE_CONFLICT || cf->file_status == FILE_LOST || cf->file_status == FILE_UNLINK) |