summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-07-18 19:20:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-18 19:20:29 (GMT)
commit2516b4711f6e180516162c384b7e94832e7189f6 (patch)
tree313a9be8723be077ed423d32822bdc61d8c4132a /builtin/log.c
parentd349e188abb88879f4c2cae9f089509b25606928 (diff)
parent15b76c1fb3ab013b99498c9dca333aaa4808927e (diff)
downloadgit-2516b4711f6e180516162c384b7e94832e7189f6.zip
git-2516b4711f6e180516162c384b7e94832e7189f6.tar.gz
git-2516b4711f6e180516162c384b7e94832e7189f6.tar.bz2
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c
index c77af79..805f89d 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);
}