diff options
| author |   joris <joris@openbsd.org> | 2006-05-27 15:17:42 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2006-05-27 15:17:42 +0000 |
| commit | c1fe09b4b0fcd456eccb51fda8cf66833bd46f9c (patch) | |
| tree | bb5b9caea80d99937df4b46c59e6a7e0201badc9 /usr.bin/cvs | |
| parent | remove debug output (diff) | |
| download | wireguard-openbsd-c1fe09b4b0fcd456eccb51fda8cf66833bd46f9c.tar.xz wireguard-openbsd-c1fe09b4b0fcd456eccb51fda8cf66833bd46f9c.zip | |
show which directory we are examining in our pre-commit checks.
Diffstat (limited to 'usr.bin/cvs')
| -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) |