diff options
| author | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2005-04-25 16:29:42 +0000 |
|---|---|---|
| committer | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2005-04-25 16:29:42 +0000 |
| commit | 4c4f857733b85f180fa6fd62c2350503e19eb0cc (patch) | |
| tree | 64e92672a483ec65ce1809c4739118043c507040 | |
| parent | ebf2aff49d480a1788e1445a8f894a830b5a786d (diff) | |
set the default branch to 1.1.1 upon import, and remove a stray
cvs_connect() call
ok joris, xsa
| -rw-r--r-- | usr.bin/cvs/import.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 9835d5333a4..ec23cb6f26d 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.12 2005/04/16 20:05:05 xsa Exp $ */ +/* $OpenBSD: import.c,v 1.13 2005/04/25 16:29:41 jfb Exp $ */ /* * Copyright (c) 2004 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -65,6 +65,8 @@ cvs_import_options(char *opt, int argc, char **argv, int *arg) { int ch; + branch = CVS_IMPORT_DEFBRANCH; + while ((ch = getopt(argc, argv, opt)) != -1) { switch (ch) { case 'b': @@ -120,8 +122,7 @@ cvs_import_options(char *opt, int argc, char **argv, int *arg) int cvs_import_sendflags(struct cvsroot *root) { - if ((cvs_connect(root) < 0) || - (cvs_sendarg(root, "-b", 0) < 0) || + if ((cvs_sendarg(root, "-b", 0) < 0) || (cvs_sendarg(root, branch, 0) < 0) || (cvs_logmsg_send(root, cvs_msg) < 0) || (cvs_sendarg(root, module, 0) < 0) || |