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>

builtin/am.c

diff --git a/builtin/am.c b/builtin/am.c
index 4e396c8..919bd91 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1653,7 +1653,7 @@
 
 		init_revisions(&rev_info, NULL);
 		rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;
-		diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1);
+		diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix);
 		add_pending_sha1(&rev_info, "HEAD", our_tree, 0);
 		diff_setup_done(&rev_info.diffopt);
 		run_diff_index(&rev_info, 1);