Merge branch 'pc/submodule-helper'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Dec 2017 21:28:56 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Dec 2017 21:28:56 +0000 (13:28 -0800)
A message fix.

* pc/submodule-helper:
submodule--helper.c: i18n: add a missing space in message

1  2 
builtin/submodule--helper.c
index 2086f0eb089b34bd38b2a4f47ae4b710b7cb0ba1,8a0b955a5d9a024e8dd0d0165c997d4174699611..a5c4a8a6941d46c78e4dc58d0df47532f0bb2b45
@@@ -27,8 -27,9 +27,8 @@@ typedef void (*each_submodule_fn)(cons
  static char *get_default_remote(void)
  {
        char *dest = NULL, *ret;
 -      unsigned char sha1[20];
        struct strbuf sb = STRBUF_INIT;
 -      const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
 +      const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
  
        if (!refname)
                die(_("No such ref: %s"), "HEAD");
@@@ -623,7 -624,7 +623,7 @@@ static void status_submodule(const cha
  
                if (refs_head_ref(get_submodule_ref_store(path),
                                  handle_submodule_head_ref, &oid))
-                       die(_("could not resolve HEAD ref inside the"
+                       die(_("could not resolve HEAD ref inside the "
                              "submodule '%s'"), path);
  
                print_status(flags, '+', path, &oid, displaypath);
@@@ -1326,7 -1327,8 +1326,7 @@@ static const char *remote_submodule_bra
                return "master";
  
        if (!strcmp(branch, ".")) {
 -              unsigned char sha1[20];
 -              const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
 +              const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
  
                if (!refname)
                        die(_("No such ref: %s"), "HEAD");
@@@ -1382,7 -1384,7 +1382,7 @@@ static int push_check(int argc, const c
        argv++;
        argc--;
        /* Get the submodule's head ref and determine if it is detached */
 -      head = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
 +      head = resolve_refdup("HEAD", 0, &head_oid, NULL);
        if (!head)
                die(_("Failed to resolve HEAD as a valid ref."));
        if (!strcmp(head, "HEAD"))
                                                break;
                                        die("HEAD does not match the named branch in the superproject");
                                }
 +                              /* fallthrough */
                        default:
                                die("src refspec '%s' must name a ref",
                                    rs->src);