From ce098c03a4ea1271a5a9049e36dc2252a6de5fb2 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 2 Dec 2002 03:17:49 +0000 Subject: Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainline Approved by: re --- contrib/cvs/src/diff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'contrib/cvs/src/diff.c') 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; -- cgit v1.1