Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuy Nguyen <pclouds@gmail.com>2016-01-21 14:48:44 +0300
committerJunio C Hamano <gitster@pobox.com>2016-01-21 21:45:13 +0300
commita97262c62f1a31fcc7edf7629d313058bc7d66b5 (patch)
tree96f459828c6adbb05998b7fca180fef22bf41a7f /diff-no-index.c
parente5f7a5d16f2c890e7dda96e5681ee8f6687b45e4 (diff)
diff: make -O and --output work in subdirectory
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-no-index.c')
-rw-r--r--diff-no-index.c3
1 files changed, 2 insertions, 1 deletions
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;