Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere

* jn/maint-http-fetch-mingw:
http-fetch: add missing initialization of argv0_path
merge: do not setup worktree twice
check-ref-format: update usage string

Conflicts:
builtin-check-ref-format.c

diff --combined builtin-check-ref-format.c
index 0a576afd0e51f166f46493d86f4a0914ed8a744b,96382e34477263275c8d1f3628e3db4755042a06..b106c65d80dfc8fe794d46e34ea1ff78b04f3056
--- 1/builtin-check-ref-format.c
--- 2/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@@ -7,33 -7,12 +7,37 @@@
  #include "builtin.h"
  #include "strbuf.h"
  
+ static const char builtin_check_ref_format_usage[] =
+ "git check-ref-format [--print] <refname>\n"
+ "   or: git check-ref-format --branch <branchname-shorthand>";
+ 
 +/*
 + * Replace each run of adjacent slashes in src with a single slash,
 + * and write the result to dst.
 + *
 + * This function is similar to normalize_path_copy(), but stripped down
 + * to meet check_ref_format's simpler needs.
 + */
 +static void collapse_slashes(char *dst, const char *src)
 +{
 +      char ch;
 +      char prev = '\0';
 +
 +      while ((ch = *src++) != '\0') {
 +              if (prev == '/' && ch == prev)
 +                      continue;
 +
 +              *dst++ = ch;
 +              prev = ch;
 +      }
 +      *dst = '\0';
 +}
 +
  int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
  {
 +      if (argc == 2 && !strcmp(argv[1], "-h"))
 +              usage(builtin_check_ref_format_usage);
 +
        if (argc == 3 && !strcmp(argv[1], "--branch")) {
                struct strbuf sb = STRBUF_INIT;
  
@@@ -42,16 -21,7 +46,16 @@@
                printf("%s\n", sb.buf + 11);
                exit(0);
        }
 +      if (argc == 3 && !strcmp(argv[1], "--print")) {
 +              char *refname = xmalloc(strlen(argv[2]) + 1);
 +
 +              if (check_ref_format(argv[2]))
 +                      exit(1);
 +              collapse_slashes(refname, argv[2]);
 +              printf("%s\n", refname);
 +              exit(0);
 +      }
        if (argc != 2)
-               usage("git check-ref-format refname");
+               usage(builtin_check_ref_format_usage);
        return !!check_ref_format(argv[1]);
  }

diff --combined builtin-merge.c
index c69a3051f38eb70f148015471d0c2df1df8db33b,e95c5dc71746fb6f4e87913669701a2f65070602..18571387f11b0ce5b5131f4e3cedd5064fa8e492
--- 1/builtin-merge.c
--- 2/builtin-merge.c
+++ b/builtin-merge.c
@@@ -264,7 -264,6 +264,7 @@@ static void squash_message(void
        struct strbuf out = STRBUF_INIT;
        struct commit_list *j;
        int fd;
 +      struct pretty_print_context ctx = {0};
  
        printf("Squash commit -- not updating HEAD\n");
        fd = open(git_path("SQUASH_MSG"), O_WRONLY | O_CREAT, 0666);
@@@ -286,15 -285,13 +286,15 @@@
        if (prepare_revision_walk(&rev))
                die("revision walk setup failed");
  
 +      ctx.abbrev = rev.abbrev;
 +      ctx.date_mode = rev.date_mode;
 +
        strbuf_addstr(&out, "Squashed commit of the following:\n");
        while ((commit = get_revision(&rev)) != NULL) {
                strbuf_addch(&out, '\n');
                strbuf_addf(&out, "commit %s\n",
                        sha1_to_hex(commit->object.sha1));
 -              pretty_print_commit(rev.commit_format, commit, &out, rev.abbrev,
 -                      NULL, NULL, rev.date_mode, 0);
 +              pretty_print_commit(rev.commit_format, commit, &out, &ctx);
        }
        if (write(fd, out.buf, out.len) < 0)
                die_errno("Writing SQUASH_MSG");
@@@ -843,7 -840,6 +843,6 @@@ int cmd_merge(int argc, const char **ar
        const char *best_strategy = NULL, *wt_strategy = NULL;
        struct commit_list **remotes = &remoteheads;
  
-       setup_work_tree();
        if (file_exists(git_path("MERGE_HEAD")))
                die("You have not concluded your merge. (MERGE_HEAD exists)");
        if (read_cache_unmerged())