fixup tr/stash-format merge

diff --cc builtin-checkout.c
Simple merge

diff --cc builtin-commit.c
Simple merge

diff --cc commit.h
index 95f981a1a93989d89edb0c5b850fa86db2071b50,15cb64920cda9cb03d1309ea4201a0fe89b3ddae..422f778f3f5b997ea1a3d8569cf6fa573481fff1
--- 1/commit.h
--- 2/commit.h
+++ b/commit.h
@@@ -70,13 -80,11 +80,11 @@@ extern char *reencode_commit_message(co
                                     const char **encoding_p);
  extern void get_commit_format(const char *arg, struct rev_info *);
  extern void format_commit_message(const struct commit *commit,
 -                                const void *format, struct strbuf *sb,
 +                                const char *format, struct strbuf *sb,
-                                 enum date_mode dmode);
- extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*,
-                                 struct strbuf *,
-                                 int abbrev, const char *subject,
-                                 const char *after_subject, enum date_mode,
-                               int need_8bit_cte);
+                                 const struct pretty_print_context *context);
+ extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
+                               struct strbuf *sb,
+                               const struct pretty_print_context *context);
  void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
                   const char *line, enum date_mode dmode,
                   const char *encoding);

diff --cc pretty.c
index 587101f846b945d7de219f468699e75565a7e9c0,fc65fca58a8403aa6080d827f5013b46ecb18921..da15cf2a80d08e38b4b0bb279e378b72dbe49cc7
--- 1/pretty.c
--- 2/pretty.c
+++ b/pretty.c
@@@ -740,8 -757,8 +757,8 @@@ static size_t format_commit_item(struc
  }
  
  void format_commit_message(const struct commit *commit,
 -                         const void *format, struct strbuf *sb,
 +                         const char *format, struct strbuf *sb,
-                          enum date_mode dmode)
+                          const struct pretty_print_context *pretty_ctx)
  {
        struct format_commit_context context;
  

diff --cc submodule.c
index d5fce7a882e14f6154d56f38531ba5d9000dabda,0000000000000000000000000000000000000000..461faf0e000ee14cdd0bb3d40121e1d21833e30d
mode 100644,000000..100644
--- 1/submodule.c
--- /dev/null
+++ b/submodule.c
@@@ -1,113 -1,0 +1,114 @@@
-                       format_commit_message(commit, format, &sb,
-                                       rev.date_mode);
 +#include "cache.h"
 +#include "submodule.h"
 +#include "dir.h"
 +#include "diff.h"
 +#include "commit.h"
 +#include "revision.h"
 +
 +int add_submodule_odb(const char *path)
 +{
 +      struct strbuf objects_directory = STRBUF_INIT;
 +      struct alternate_object_database *alt_odb;
 +
 +      strbuf_addf(&objects_directory, "%s/.git/objects/", path);
 +      if (!is_directory(objects_directory.buf))
 +              return -1;
 +
 +      /* avoid adding it twice */
 +      for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
 +              if (alt_odb->name - alt_odb->base == objects_directory.len &&
 +                              !strncmp(alt_odb->base, objects_directory.buf,
 +                                      objects_directory.len))
 +                      return 0;
 +
 +      alt_odb = xmalloc(objects_directory.len + 42 + sizeof(*alt_odb));
 +      alt_odb->next = alt_odb_list;
 +      strcpy(alt_odb->base, objects_directory.buf);
 +      alt_odb->name = alt_odb->base + objects_directory.len;
 +      alt_odb->name[2] = '/';
 +      alt_odb->name[40] = '\0';
 +      alt_odb->name[41] = '\0';
 +      alt_odb_list = alt_odb;
 +      prepare_alt_odb();
 +      return 0;
 +}
 +
 +void show_submodule_summary(FILE *f, const char *path,
 +              unsigned char one[20], unsigned char two[20],
 +              const char *del, const char *add, const char *reset)
 +{
 +      struct rev_info rev;
 +      struct commit *commit, *left = left, *right;
 +      struct commit_list *merge_bases, *list;
 +      const char *message = NULL;
 +      struct strbuf sb = STRBUF_INIT;
 +      static const char *format = "  %m %s";
 +      int fast_forward = 0, fast_backward = 0;
 +
 +      if (is_null_sha1(two))
 +              message = "(submodule deleted)";
 +      else if (add_submodule_odb(path))
 +              message = "(not checked out)";
 +      else if (is_null_sha1(one))
 +              message = "(new submodule)";
 +      else if (!(left = lookup_commit_reference(one)) ||
 +               !(right = lookup_commit_reference(two)))
 +              message = "(commits not present)";
 +
 +      if (!message) {
 +              init_revisions(&rev, NULL);
 +              setup_revisions(0, NULL, &rev, NULL);
 +              rev.left_right = 1;
 +              rev.first_parent_only = 1;
 +              left->object.flags |= SYMMETRIC_LEFT;
 +              add_pending_object(&rev, &left->object, path);
 +              add_pending_object(&rev, &right->object, path);
 +              merge_bases = get_merge_bases(left, right, 1);
 +              if (merge_bases) {
 +                      if (merge_bases->item == left)
 +                              fast_forward = 1;
 +                      else if (merge_bases->item == right)
 +                              fast_backward = 1;
 +              }
 +              for (list = merge_bases; list; list = list->next) {
 +                      list->item->object.flags |= UNINTERESTING;
 +                      add_pending_object(&rev, &list->item->object,
 +                              sha1_to_hex(list->item->object.sha1));
 +              }
 +              if (prepare_revision_walk(&rev))
 +                      message = "(revision walker failed)";
 +      }
 +
 +      strbuf_addf(&sb, "Submodule %s %s..", path,
 +                      find_unique_abbrev(one, DEFAULT_ABBREV));
 +      if (!fast_backward && !fast_forward)
 +              strbuf_addch(&sb, '.');
 +      strbuf_addf(&sb, "%s", find_unique_abbrev(two, DEFAULT_ABBREV));
 +      if (message)
 +              strbuf_addf(&sb, " %s\n", message);
 +      else
 +              strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
 +      fwrite(sb.buf, sb.len, 1, f);
 +
 +      if (!message) {
 +              while ((commit = get_revision(&rev))) {
++                      struct pretty_print_context ctx = {0};
++                      ctx.date_mode = rev.date_mode;
 +                      strbuf_setlen(&sb, 0);
 +                      if (commit->object.flags & SYMMETRIC_LEFT) {
 +                              if (del)
 +                                      strbuf_addstr(&sb, del);
 +                      }
 +                      else if (add)
 +                              strbuf_addstr(&sb, add);
++                      format_commit_message(commit, format, &sb, &ctx);
 +                      if (reset)
 +                              strbuf_addstr(&sb, reset);
 +                      strbuf_addch(&sb, '\n');
 +                      fprintf(f, "%s", sb.buf);
 +              }
 +              clear_commit_marks(left, ~0);
 +              clear_commit_marks(right, ~0);
 +      }
 +      strbuf_release(&sb);
 +}