diff options
| author | Niall O'Higgins <niallo@cvs.openbsd.org> | 2006-04-16 12:30:01 +0000 |
|---|---|---|
| committer | Niall O'Higgins <niallo@cvs.openbsd.org> | 2006-04-16 12:30:01 +0000 |
| commit | 6a0b57b25ae50c006547f2b4619a13bf1d470759 (patch) | |
| tree | 05b4cd672a317c345648e0b79642887ee42af249 /usr.bin/rcs/ci.c | |
| parent | 74d870a8ac1de6af2e6f7eb3105ff201ac61e6f4 (diff) | |
- fix description handling.
ok joris@ xsa@
Diffstat (limited to 'usr.bin/rcs/ci.c')
| -rw-r--r-- | usr.bin/rcs/ci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index 791b5bb781a..67c7db491ed 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.147 2006/04/14 01:11:07 deraadt Exp $ */ +/* $OpenBSD: ci.c,v 1.148 2006/04/16 12:30:00 niallo Exp $ */ /* * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -281,6 +281,8 @@ checkin_main(int argc, char **argv) NULL) fatal("invalid revision: %s", rev_str); + if (!(pb.flags & NEWFILE)) + pb.flags |= CI_SKIPDESC; /* XXX - support for commiting to a file without revisions */ if (pb.file->rf_ndelta == 0) { pb.flags |= NEWFILE; @@ -665,7 +667,7 @@ checkin_init(struct checkin_params *pb) checkin_keywordscan(filec, &pb->newrev, &pb->date, &pb->state, &pb->author); - if (pb->file->rf_ndelta == 0) + if (pb->flags & CI_SKIPDESC) goto skipdesc; /* Get description from user */ |