diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:29 -0700 |
| commit | 2516b4711f6e180516162c384b7e94832e7189f6 (patch) | |
| tree | 313a9be8723be077ed423d32822bdc61d8c4132a /builtin/log.c | |
| parent | Merge branch 'pw/rebase-i-keep-reword-after-conflict' (diff) | |
| parent | format-patch: clear UNINTERESTING flag before prepare_bases (diff) | |
| download | git-2516b4711f6e180516162c384b7e94832e7189f6.tar.gz git-2516b4711f6e180516162c384b7e94832e7189f6.zip | |
Merge branch 'xy/format-patch-prereq-patch-id-fix'
Recently added "--base" option to "git format-patch" command did
not correctly generate prereq patch ids.
* xy/format-patch-prereq-patch-id-fix:
format-patch: clear UNINTERESTING flag before prepare_bases
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index c77af79755..805f89d7e1 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1756,6 +1756,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (base_commit || base_auto) { struct commit *base = get_base_commit(base_commit, list, nr); reset_revision_walk(); + clear_object_flags(UNINTERESTING); prepare_bases(&bases, base, list, nr); } |