Merge branch 'xy/format-patch-prereq-patch-id-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
commit2516b4711f6e180516162c384b7e94832e7189f6
tree313a9be8723be077ed423d32822bdc61d8c4132a
parentd349e188abb88879f4c2cae9f089509b25606928
parent15b76c1fb3ab013b99498c9dca333aaa4808927e
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
builtin/log.c
t/t4014-format-patch.sh