diff options
| author | peter <peter@FreeBSD.org> | 2002-12-02 03:17:49 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-12-02 03:17:49 +0000 |
| commit | ce098c03a4ea1271a5a9049e36dc2252a6de5fb2 (patch) | |
| tree | d5416c787fc483c91bdc8a2162dc489b0e1c08d9 /contrib/cvs/src/diff.c | |
| parent | c88e7301411c002ff913342f1619967f7c3b58e7 (diff) | |
| download | FreeBSD-src-ce098c03a4ea1271a5a9049e36dc2252a6de5fb2.zip FreeBSD-src-ce098c03a4ea1271a5a9049e36dc2252a6de5fb2.tar.gz | |
Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainline
Approved by: re
Diffstat (limited to 'contrib/cvs/src/diff.c')
| -rw-r--r-- | contrib/cvs/src/diff.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cvs/src/diff.c b/contrib/cvs/src/diff.c index be1fb5f..edf1af4 100644 --- a/contrib/cvs/src/diff.c +++ b/contrib/cvs/src/diff.c @@ -421,6 +421,7 @@ diff (argc, argv) option_with_arg ("-r", diff_rev2); else if (diff_date2) client_senddate (diff_date2); + send_arg ("--"); /* Send the current files unless diffing two revs from the archive */ if (diff_rev2 == NULL && diff_date2 == NULL) @@ -449,9 +450,9 @@ diff (argc, argv) /* start the recursion processor */ err = start_recursion (diff_fileproc, diff_filesdoneproc, diff_dirproc, diff_dirleaveproc, NULL, argc, argv, local, - which, 0, 1, (char *) NULL, 1); - + which, 0, LOCK_READ, (char *) NULL, 1); } + /* clean up */ free (options); options = NULL; |
