summaryrefslogtreecommitdiff
path: root/usr.bin/rcs
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2007-01-15 14:34:55 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2007-01-15 14:34:55 +0000
commit5c4cbd50e58df62a569cb983de227a5afdf2e60d (patch)
treedea819e1603106774f1585b870dad7e4ba553783 /usr.bin/rcs
parentbe4718dcdd9b00d61ec1c21688905b48fbdf9302 (diff)
When checking in multiple files, if no log message is entered for
a file, don't prompt the user to reuse the (non-existent) log message for the next. Makes ci behave like the GNU version. OK xsa@, joris@, niallo@
Diffstat (limited to 'usr.bin/rcs')
-rw-r--r--usr.bin/rcs/ci.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index 211371685aa..a0cc78f6e46 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ci.c,v 1.191 2006/12/23 21:08:01 krw Exp $ */
+/* $OpenBSD: ci.c,v 1.192 2007/01/15 14:34:54 millert Exp $ */
/*
* Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org>
* All rights reserved.
@@ -574,6 +574,11 @@ checkin_update(struct checkin_params *pb)
!(pb->flags & CI_DEFAULT))
checkout_rev(pb->file, pb->newrev, pb->filename, pb->flags,
pb->username, pb->author, NULL, NULL);
+
+ if ((pb->flags & INTERACTIVE) && (pb->rcs_msg[0] == '\0')) {
+ xfree(pb->rcs_msg); /* free empty log message */
+ pb->rcs_msg = NULL;
+ }
out:
return (0);