diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:09 -0700 |
| commit | 7fd739cd5720fbd1d170584baff7e4f706df641c (patch) | |
| tree | a7f00c907b31236eba887075542d83410d08782e /builtin/log.c | |
| parent | b3c16ee454effda5ec8033ab665249710f622699 (diff) | |
| parent | 2c642ed8668745271a714f0a672dbfcd6b0a6fa8 (diff) | |
| download | git-7fd739cd5720fbd1d170584baff7e4f706df641c.tar.gz | |
Merge branch 'rr/format-patch-count-without-merges'
* rr/format-patch-count-without-merges:
format-patch: Don't go over merge commits
t4014-format-patch: Call test_tick before committing
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/log.c b/builtin/log.c index eaa1ee0fa7..22d12903ac 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1056,8 +1056,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.commit_format = CMIT_FMT_EMAIL; rev.verbose_header = 1; rev.diff = 1; - rev.combine_merges = 0; - rev.ignore_merges = 1; + rev.no_merges = 1; DIFF_OPT_SET(&rev.diffopt, RECURSIVE); rev.subject_prefix = fmt_patch_subject_prefix; memset(&s_r_opt, 0, sizeof(s_r_opt)); @@ -1228,10 +1227,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) continue; } - /* ignore merges */ - if (commit->parents && commit->parents->next) - continue; - if (ignore_if_in_upstream && has_commit_patch_id(commit, &ids)) continue; |