Merge branch 'jc/combine' into next

* jc/combine:
  stripspace: make sure not to leave an incomplete line.
  git-commit: do not muck with commit message when no_edit is set.
  When showing a commit message, do not lose an incomplete line.
  Retire t5501-old-fetch-and-upload test.
  combine-diff: type fix.

diff --combined combine-diff.c
index 3a0ec61,e519583..9bd27f8
--- 1/combine-diff.c
--- 2/combine-diff.c
+++ b/combine-diff.c
@@@ -506,8 -506,8 +506,8 @@@ static void dump_sline(struct sline *sl
  
        while (1) {
                struct sline *sl = &sline[lno];
-               int hunk_end;
-               int rlines;
+               unsigned long hunk_end;
+               unsigned long rlines;
                while (lno <= cnt && !(sline[lno].flag & mark))
                        lno++;
                if (cnt < lno)
@@@ -843,7 -843,6 +843,7 @@@ const char *diff_tree_combined_merge(co
  
        diffopts = *opt;
        diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
 +      diffopts.with_raw = 0;
        diffopts.recursive = 1;
  
        /* count parents */
@@@ -870,17 -869,6 +870,17 @@@
                        num_paths++;
        }
        if (num_paths) {
 +              if (opt->with_raw) {
 +                      int saved_format = opt->output_format;
 +                      opt->output_format = DIFF_FORMAT_RAW;
 +                      for (p = paths; p; p = p->next) {
 +                              if (show_combined_diff(p, num_parent, dense,
 +                                                     header, opt))
 +                                      header = NULL;
 +                      }
 +                      opt->output_format = saved_format;
 +                      putchar(opt->line_termination);
 +              }
                for (p = paths; p; p = p->next) {
                        if (show_combined_diff(p, num_parent, dense,
                                               header, opt))