diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-01-28 20:31:08 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-01-28 20:31:08 +0000 |
| commit | bf7135c7ea4db345cb2522857eb152e8ab13c639 (patch) | |
| tree | 5ad7d2fdf7e2fe4a6817a4bee5a19030a725bd5f /usr.bin/cvs/diff.c | |
| parent | 70ece8be1d4df61fee1848497ed18b744905a684 (diff) | |
Properly handle -R -- although it is default, it may be overwritten mit -l
in front of it.
OK joris@, xsa@
> Diff from Igor Zinovik
Diffstat (limited to 'usr.bin/cvs/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index b5740e73d0b..00392a367d3 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.121 2007/09/22 16:01:22 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.122 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -35,7 +35,7 @@ struct cvs_cmd cvs_cmd_diff = { CVS_OP_DIFF, 0, "diff", { "di", "dif" }, "Show differences between revisions", - "[-cilNnpu] [[-D date] [-r rev] [-D date2 | -r rev2]] " + "[-cilNnpRu] [[-D date] [-r rev] [-D date2 | -r rev2]] " "[-k mode] [file ...]", "cD:iklNnpr:Ru", NULL, @@ -74,6 +74,9 @@ cvs_diff(int argc, char **argv) strlcat(diffargs, " -p", sizeof(diffargs)); diff_pflag = 1; break; + case 'R': + flags |= CR_RECURSE_DIRS; + break; case 'r': if (rev1 == NULL) { rev1 = optarg; |