Merge branch 'bw/config-refer-to-gitsubmodules-doc'

diff --git a/builtin/log.c b/builtin/log.c
index 0583f7f383a481f353909dc5b406b38745549c63..805f89d7e1552e86a8c2b990a0e213d09f91d42a 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -7,6 +7,7 @@
 #include "cache.h"
 #include "config.h"
 #include "refs.h"
+#include "object-store.h"
 #include "color.h"
 #include "commit.h"
 #include "diff.h"
@@ -1755,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);
        }