commit a97262c62f1a31fcc7edf7629d313058bc7d66b5
author Duy Nguyen <pclouds@gmail.com> Thu Jan 21 18:48:44 2016 +0700
committer Junio C Hamano <gitster@pobox.com> Thu Jan 21 10:45:13 2016 -0800
tree 96f459828c6adbb05998b7fca180fef22bf41a7f
parent e5f7a5d16f2c890e7dda96e5681ee8f6687b45e4

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>

diff.h

diff --git a/diff.h b/diff.h
index f61ee54..76b5536 100644
--- a/diff.h
+++ b/diff.h
@@ -268,7 +268,7 @@
 extern int git_diff_basic_config(const char *var, const char *value, void *cb);
 extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 extern void diff_setup(struct diff_options *);
-extern int diff_opt_parse(struct diff_options *, const char **, int);
+extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
 extern void diff_setup_done(struct diff_options *);
 
 #define DIFF_DETECT_RENAME	1