Merge branch 'jk/common-main-2.8' into jk/common-main

* jk/common-main-2.8:
  mingw: declare main()'s argv as const
  common-main: call git_setup_gettext()
  common-main: call restore_sigpipe_to_default()
  common-main: call sanitize_stdfds()
  common-main: call git_extract_argv0_path()
  add an extra level of indirection to main()

diff --cc Makefile
Simple merge

diff --cc credential-cache--daemon.c
Simple merge

diff --cc fast-import.c
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc http-backend.c
Simple merge

diff --cc http-push.c
Simple merge

diff --cc remote-curl.c
Simple merge

diff --cc t/helper/test-chmtime.c
Simple merge

diff --cc t/helper/test-config.c
Simple merge

diff --cc t/helper/test-ctype.c
Simple merge

diff --cc t/helper/test-date.c
Simple merge

diff --cc t/helper/test-delta.c
Simple merge

diff --cc t/helper/test-dump-cache-tree.c
Simple merge

diff --cc t/helper/test-dump-split-index.c
Simple merge

diff --cc t/helper/test-dump-untracked-cache.c
Simple merge

diff --cc t/helper/test-fake-ssh.c
Simple merge

diff --cc t/helper/test-genrandom.c
Simple merge

diff --cc t/helper/test-hashmap.c
Simple merge

diff --cc t/helper/test-index-version.c
Simple merge

diff --cc t/helper/test-line-buffer.c
Simple merge

diff --cc t/helper/test-match-trees.c
index d446b8eaca727dfa9c1b0928f2b8c9af286f2702,afcdc143b51e0143f8d8761b927ff02b42ca7580..e9395028630bf26390366065aa07bc7b2827eb73
--- 1/t/helper/test-match-trees.c
--- 2/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@@ -1,9 -1,9 +1,9 @@@
  #include "cache.h"
  #include "tree.h"
  
- int main(int ac, char **av)
+ int cmd_main(int ac, const char **av)
  {
 -      unsigned char hash1[20], hash2[20], shifted[20];
 +      struct object_id hash1, hash2, shifted;
        struct tree *one, *two;
  
        setup_git_directory();

diff --cc t/helper/test-mergesort.c
Simple merge

diff --cc t/helper/test-mktemp.c
Simple merge

diff --cc t/helper/test-parse-options.c
index 8a1235d03e2daab4b9e90d31c5da6708e5c712f2,7adae43b87a8e89652681b850e6e6d586ef30462..d51d29251eb2cf5adeba1d4f94ff2ce100421560
--- 1/t/helper/test-parse-options.c
--- 2/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@@ -39,62 -30,7 +39,62 @@@ static int number_callback(const struc
        return 0;
  }
  
- int main(int argc, char **argv)
 +static int collect_expect(const struct option *opt, const char *arg, int unset)
 +{
 +      struct string_list *expect;
 +      struct string_list_item *item;
 +      struct strbuf label = STRBUF_INIT;
 +      const char *colon;
 +
 +      if (!arg || unset)
 +              die("malformed --expect option");
 +
 +      expect = (struct string_list *)opt->value;
 +      colon = strchr(arg, ':');
 +      if (!colon)
 +              die("malformed --expect option, lacking a colon");
 +      strbuf_add(&label, arg, colon - arg);
 +      item = string_list_insert(expect, strbuf_detach(&label, NULL));
 +      if (item->util)
 +              die("malformed --expect option, duplicate %s", label.buf);
 +      item->util = (void *)arg;
 +      return 0;
 +}
 +
 +__attribute__((format (printf,3,4)))
 +static void show(struct string_list *expect, int *status, const char *fmt, ...)
 +{
 +      struct string_list_item *item;
 +      struct strbuf buf = STRBUF_INIT;
 +      va_list args;
 +
 +      va_start(args, fmt);
 +      strbuf_vaddf(&buf, fmt, args);
 +      va_end(args);
 +
 +      if (!expect->nr)
 +              printf("%s\n", buf.buf);
 +      else {
 +              char *colon = strchr(buf.buf, ':');
 +              if (!colon)
 +                      die("malformed output format, output lacking colon: %s", fmt);
 +              *colon = '\0';
 +              item = string_list_lookup(expect, buf.buf);
 +              *colon = ':';
 +              if (!item)
 +                      ; /* not among entries being checked */
 +              else {
 +                      if (strcmp((const char *)item->util, buf.buf)) {
 +                              printf("-%s\n", (char *)item->util);
 +                              printf("+%s\n", buf.buf);
 +                              *status = 1;
 +                      }
 +              }
 +      }
 +      strbuf_release(&buf);
 +}
 +
+ int cmd_main(int argc, const char **argv)
  {
        const char *prefix = "prefix/";
        const char *usage[] = {

diff --cc t/helper/test-path-utils.c
Simple merge

diff --cc t/helper/test-prio-queue.c
Simple merge

diff --cc t/helper/test-read-cache.c
Simple merge

diff --cc t/helper/test-regex.c
Simple merge

diff --cc t/helper/test-revision-walking.c
Simple merge

diff --cc t/helper/test-run-command.c
Simple merge

diff --cc t/helper/test-scrap-cache-tree.c
Simple merge

diff --cc t/helper/test-sha1-array.c
Simple merge

diff --cc t/helper/test-sha1.c
Simple merge

diff --cc t/helper/test-sigchain.c
Simple merge

diff --cc t/helper/test-string-list.c
Simple merge

diff --cc t/helper/test-submodule-config.c
Simple merge

diff --cc t/helper/test-subprocess.c
Simple merge

diff --cc t/helper/test-svn-fe.c
Simple merge

diff --cc t/helper/test-urlmatch-normalization.c
Simple merge

diff --cc t/helper/test-wildmatch.c
Simple merge

diff --cc upload-pack.c
Simple merge