diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:25:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:25:39 -0700 |
| commit | 797d44343c831680aeae3392259fcadeb178bf61 (patch) | |
| tree | 6639bf5dfb12eea0a67bd3b3323e3cabd79bc58e /diff-lib.c | |
| parent | 954f7cfdac48b8d9fe91c29ecfa44ac0c639867c (diff) | |
| parent | 2bf6587349e31b582dae47954b1a334052230e28 (diff) | |
| download | git-797d44343c831680aeae3392259fcadeb178bf61.tar.gz git-797d44343c831680aeae3392259fcadeb178bf61.tar.xz | |
Merge branch 'pb/log-first-parent-p-m'
* pb/log-first-parent-p-m:
show --first-parent/-m: do not default to --cc
show -c: show patch text
revision: introduce setup_revision_opt
t4013: add tests for log -p -m --first-parent
git log -p -m: document -m and honor --first-parent
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index d7e13cb17..64976f921 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -510,9 +510,12 @@ int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt) int index_differs_from(const char *def, int diff_flags) { struct rev_info rev; + struct setup_revision_opt opt; init_revisions(&rev, NULL); - setup_revisions(0, NULL, &rev, def); + memset(&opt, 0, sizeof(opt)); + opt.def = def; + setup_revisions(0, NULL, &rev, &opt); DIFF_OPT_SET(&rev.diffopt, QUICK); DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS); rev.diffopt.flags |= diff_flags; |