diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 22:54:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 22:54:15 (GMT) |
| commit | 02dab5d399fb276f91646d7780da90596bffefab (patch) | |
| tree | 29b03cb0e3c0a2111307903c4cf1ba9d895c25d3 /builtin | |
| parent | 6a65bdcc8c610b31fff6a171e6f49045c3980027 (diff) | |
| parent | a97262c62f1a31fcc7edf7629d313058bc7d66b5 (diff) | |
| download | git-02dab5d399fb276f91646d7780da90596bffefab.zip git-02dab5d399fb276f91646d7780da90596bffefab.tar.gz git-02dab5d399fb276f91646d7780da90596bffefab.tar.bz2 | |
Merge branch 'nd/diff-with-path-params' into maint
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')
| -rw-r--r-- | builtin/am.c | 2 | ||||
| -rw-r--r-- | builtin/diff.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index de235cf..95decc6 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1657,7 +1657,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); diff --git a/builtin/diff.c b/builtin/diff.c index ed0acca..52c98a9 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -341,7 +341,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) } if (no_index) /* If this is a no-index diff, just run it and exit there. */ - diff_no_index(&rev, argc, argv, prefix); + diff_no_index(&rev, argc, argv); /* Otherwise, we are doing the usual "git" diff */ rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index; |