diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-04-22 03:38:57 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-04-22 03:38:57 +0000 |
| commit | beb4aab8dd61673ccfeb1c5a34388697c885b9f0 (patch) | |
| tree | e447153f02633cc3fd238187be53d4a8c7970257 /usr.bin/cvs | |
| parent | 8ed36a193e5061d3cd66116d644727eaf15c6984 (diff) | |
missing '-R' (force recursion) option for diff.
noticed by brad@
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/cvs.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/diff.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index bc83c2e2384..e4ba5e73894 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.57 2005/04/21 20:56:12 xsa Exp $ */ +/* $OpenBSD: cvs.c,v 1.58 2005/04/22 03:38:56 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -124,7 +124,7 @@ struct cvs_cmd cvs_cdt[] = { { CVS_OP_DIFF, "diff", { "di", "dif" }, &cvs_diff, "[-cilNpu] [-D date] [-r rev] ...", - "cD:ilNpr:u", + "cD:ilNpr:Ru", "Show differences between revisions", NULL }, diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 862d0f99f7b..046e93d08a6 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.31 2005/04/18 21:02:49 jfb Exp $ */ +/* $OpenBSD: diff.c,v 1.32 2005/04/22 03:38:56 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -409,6 +409,9 @@ cvs_diff_options(char *opt, int argc, char **argv, int *arg) return (CVS_EX_USAGE); } break; + case 'R': + cvs_diff.file_flags |= CF_RECURSE; + break; case 'u': strlcat(diffargs, " -u", sizeof(diffargs)); format = D_UNIFIED; |