diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-10 02:11:20 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-10 02:11:20 +0000 |
| commit | 4f01ce3a0817043442dbf8976f2ebd4ea514693c (patch) | |
| tree | 576736c6d5d5c9ddaf9cfa5aa354456690a0f8fd | |
| parent | 538884ba8214c99370aeebb5836ac4baaa7740d7 (diff) | |
Don't spawn editor for log message on server-side if no log message has
been supplied as argument by client.
ok joris
| -rw-r--r-- | usr.bin/cvs/import.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 447a2ee2f88..ca6f024d165 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.93 2008/06/10 01:00:34 joris Exp $ */ +/* $OpenBSD: import.c,v 1.94 2008/06/10 02:11:19 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -118,11 +118,12 @@ cvs_import(int argc, char **argv) fatal("invalid symbol: %s", release_tags[i]); } - if (logmsg == NULL) - logmsg = cvs_logmsg_create(NULL, NULL, NULL, NULL); - - if (logmsg == NULL) - fatal("This shouldnt happen, honestly!"); + if (logmsg == NULL) { + if (cvs_server_active) + fatal("no log message specified"); + else + logmsg = cvs_logmsg_create(NULL, NULL, NULL, NULL); + } if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { cvs_client_connect_to_server(); |