Merge branch 'jk/update-links-in-docs' into maint

A few http:// links that are redirected to https:// in the
documentation have been updated to https:// links.

* jk/update-links-in-docs:
doc: use https links to Wikipedia to avoid http redirects

diff --combined bisect.c
index 08c9fb7266c3b2ff8b970c21d350be4adfe7b0fc,b79c1d464cac0646fdcc05bfb012ceb7fdd0a204..fa477a3e2443121ab859d71bb21c382926ac3a21
--- 1/bisect.c
--- 2/bisect.c
+++ b/bisect.c
@@@ -12,8 -12,8 +12,8 @@@
  #include "sha1-array.h"
  #include "argv-array.h"
  
 -static struct sha1_array good_revs;
 -static struct sha1_array skipped_revs;
 +static struct oid_array good_revs;
 +static struct oid_array skipped_revs;
  
  static struct object_id *current_bad_oid;
  
@@@ -200,7 -200,6 +200,7 @@@ static struct commit_list *best_bisecti
  {
        struct commit_list *p;
        struct commit_dist *array = xcalloc(nr, sizeof(*array));
 +      struct strbuf buf = STRBUF_INIT;
        int cnt, i;
  
        for (p = list, cnt = 0; p; p = p->next) {
@@@ -218,18 -217,17 +218,18 @@@
        }
        QSORT(array, cnt, compare_commit_dist);
        for (p = list, i = 0; i < cnt; i++) {
 -              char buf[100]; /* enough for dist=%d */
                struct object *obj = &(array[i].commit->object);
  
 -              snprintf(buf, sizeof(buf), "dist=%d", array[i].distance);
 -              add_name_decoration(DECORATION_NONE, buf, obj);
 +              strbuf_reset(&buf);
 +              strbuf_addf(&buf, "dist=%d", array[i].distance);
 +              add_name_decoration(DECORATION_NONE, buf.buf, obj);
  
                p->item = array[i].commit;
                p = p->next;
        }
        if (p)
                p->next = NULL;
 +      strbuf_release(&buf);
        free(array);
        return list;
  }
@@@ -415,9 -413,9 +415,9 @@@ static int register_ref(const char *ref
                current_bad_oid = xmalloc(sizeof(*current_bad_oid));
                oidcpy(current_bad_oid, oid);
        } else if (starts_with(refname, good_prefix.buf)) {
 -              sha1_array_append(&good_revs, oid->hash);
 +              oid_array_append(&good_revs, oid);
        } else if (starts_with(refname, "skip-")) {
 -              sha1_array_append(&skipped_revs, oid->hash);
 +              oid_array_append(&skipped_revs, oid);
        }
  
        strbuf_release(&good_prefix);
@@@ -432,7 -430,6 +432,7 @@@ static int read_bisect_refs(void
  
  static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
  static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
 +static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
  
  static void read_bisect_paths(struct argv_array *array)
  {
@@@ -454,13 -451,13 +454,13 @@@
        fclose(fp);
  }
  
 -static char *join_sha1_array_hex(struct sha1_array *array, char delim)
 +static char *join_sha1_array_hex(struct oid_array *array, char delim)
  {
        struct strbuf joined_hexs = STRBUF_INIT;
        int i;
  
        for (i = 0; i < array->nr; i++) {
 -              strbuf_addstr(&joined_hexs, sha1_to_hex(array->sha1[i]));
 +              strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i));
                if (i + 1 < array->nr)
                        strbuf_addch(&joined_hexs, delim);
        }
@@@ -502,7 -499,8 +502,7 @@@ struct commit_list *filter_skipped(stru
        while (list) {
                struct commit_list *next = list->next;
                list->next = NULL;
 -              if (0 <= sha1_array_lookup(&skipped_revs,
 -                                         list->item->object.oid.hash)) {
 +              if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) {
                        if (skipped_first && !*skipped_first)
                                *skipped_first = 1;
                        /* Move current to tried list */
@@@ -546,7 -544,7 +546,7 @@@ static unsigned get_prn(unsigned count
  
  /*
   * Custom integer square root from
-  * http://en.wikipedia.org/wiki/Integer_square_root
+  * https://en.wikipedia.org/wiki/Integer_square_root
   */
  static int sqrti(int val)
  {
@@@ -623,7 -621,7 +623,7 @@@ static void bisect_rev_setup(struct rev
        argv_array_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid));
        for (i = 0; i < good_revs.nr; i++)
                argv_array_pushf(&rev_argv, good_format,
 -                               sha1_to_hex(good_revs.sha1[i]));
 +                               oid_to_hex(good_revs.oid + i));
        argv_array_push(&rev_argv, "--");
        if (read_paths)
                read_bisect_paths(&rev_argv);
@@@ -684,7 -682,7 +684,7 @@@ static int is_expected_rev(const struc
  
  static int bisect_checkout(const unsigned char *bisect_rev, int no_checkout)
  {
 -      char bisect_rev_hex[GIT_SHA1_HEXSZ + 1];
 +      char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
  
        memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
        update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
@@@ -703,11 -701,11 +703,11 @@@
        return run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
  }
  
 -static struct commit *get_commit_reference(const unsigned char *sha1)
 +static struct commit *get_commit_reference(const struct object_id *oid)
  {
 -      struct commit *r = lookup_commit_reference(sha1);
 +      struct commit *r = lookup_commit_reference(oid->hash);
        if (!r)
 -              die(_("Not a valid commit name %s"), sha1_to_hex(sha1));
 +              die(_("Not a valid commit name %s"), oid_to_hex(oid));
        return r;
  }
  
@@@ -717,9 -715,9 +717,9 @@@ static struct commit **get_bad_and_good
        int i, n = 0;
  
        ALLOC_ARRAY(rev, 1 + good_revs.nr);
 -      rev[n++] = get_commit_reference(current_bad_oid->hash);
 +      rev[n++] = get_commit_reference(current_bad_oid);
        for (i = 0; i < good_revs.nr; i++)
 -              rev[n++] = get_commit_reference(good_revs.sha1[i]);
 +              rev[n++] = get_commit_reference(good_revs.oid + i);
        *rev_nr = n;
  
        return rev;
@@@ -756,9 -754,9 +756,9 @@@ static void handle_bad_merge_base(void
        exit(1);
  }
  
 -static void handle_skipped_merge_base(const unsigned char *mb)
 +static void handle_skipped_merge_base(const struct object_id *mb)
  {
 -      char *mb_hex = sha1_to_hex(mb);
 +      char *mb_hex = oid_to_hex(mb);
        char *bad_hex = oid_to_hex(current_bad_oid);
        char *good_hex = join_sha1_array_hex(&good_revs, ' ');
  
@@@ -789,16 -787,16 +789,16 @@@ static void check_merge_bases(int no_ch
        result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
  
        for (; result; result = result->next) {
 -              const unsigned char *mb = result->item->object.oid.hash;
 -              if (!hashcmp(mb, current_bad_oid->hash)) {
 +              const struct object_id *mb = &result->item->object.oid;
 +              if (!oidcmp(mb, current_bad_oid)) {
                        handle_bad_merge_base();
 -              } else if (0 <= sha1_array_lookup(&good_revs, mb)) {
 +              } else if (0 <= oid_array_lookup(&good_revs, mb)) {
                        continue;
 -              } else if (0 <= sha1_array_lookup(&skipped_revs, mb)) {
 +              } else if (0 <= oid_array_lookup(&skipped_revs, mb)) {
                        handle_skipped_merge_base(mb);
                } else {
                        printf(_("Bisecting: a merge base must be tested\n"));
 -                      exit(bisect_checkout(mb, no_checkout));
 +                      exit(bisect_checkout(mb->hash, no_checkout));
                }
        }
  
@@@ -907,7 -905,7 +907,7 @@@ static void show_diff_tree(const char *
  void read_bisect_terms(const char **read_bad, const char **read_good)
  {
        struct strbuf str = STRBUF_INIT;
 -      const char *filename = git_path("BISECT_TERMS");
 +      const char *filename = git_path_bisect_terms();
        FILE *fp = fopen(filename, "r");
  
        if (!fp) {