summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-03 22:16:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-03 22:16:04 (GMT)
commitc167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a (patch)
tree9cd4964f51f8c32133d5e5cce34bedd86e11ee4d /builtin/am.c
parent465c30a9c6f68c3bac25cd875624286baa37b41c (diff)
parenta97262c62f1a31fcc7edf7629d313058bc7d66b5 (diff)
downloadgit-c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a.zip
git-c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a.tar.gz
git-c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a.tar.bz2
Merge branch 'nd/diff-with-path-params'
A few options of "git diff" did not work well when the command was run from a subdirectory. * nd/diff-with-path-params: diff: make -O and --output work in subdirectory diff-no-index: do not take a redundant prefix argument
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c
index b55f903..259dc1c 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1642,7 +1642,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
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);