From a97262c62f1a31fcc7edf7629d313058bc7d66b5 Mon Sep 17 00:00:00 2001 From: Duy Nguyen Date: Thu, 21 Jan 2016 18:48:44 +0700 Subject: diff: make -O and --output work in subdirectory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff-no-index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'diff-no-index.c') diff --git a/diff-no-index.c b/diff-no-index.c index 8edc6f3690..95057b7a7f 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -254,7 +254,8 @@ void diff_no_index(struct rev_info *revs, else if (!strcmp(argv[i], "--")) i++; else { - j = diff_opt_parse(&revs->diffopt, argv + i, argc - i); + j = diff_opt_parse(&revs->diffopt, argv + i, argc - i, + revs->prefix); if (j <= 0) die("invalid diff option/value: %s", argv[i]); i += j; -- cgit v1.2.1