Merge branch 'nd/git-common-dir-fix'

diff --git a/builtin/am.c b/builtin/am.c
index b55f903f058047bc59773dd691892c621351f9ba..259dc1cd117ec18d37d4199873c11bbf70ad6dfb 100644 (file)
--- 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);