builtin / submodule--helper.con commit Merge branch 'ex/deprecate-empty-pathspec-as-match-all' (3b1e135)
   1#include "builtin.h"
   2#include "cache.h"
   3#include "parse-options.h"
   4#include "quote.h"
   5#include "pathspec.h"
   6#include "dir.h"
   7#include "utf8.h"
   8#include "submodule.h"
   9#include "submodule-config.h"
  10#include "string-list.h"
  11#include "run-command.h"
  12#include "remote.h"
  13#include "refs.h"
  14#include "connect.h"
  15
  16static char *get_default_remote(void)
  17{
  18        char *dest = NULL, *ret;
  19        unsigned char sha1[20];
  20        struct strbuf sb = STRBUF_INIT;
  21        const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
  22
  23        if (!refname)
  24                die(_("No such ref: %s"), "HEAD");
  25
  26        /* detached HEAD */
  27        if (!strcmp(refname, "HEAD"))
  28                return xstrdup("origin");
  29
  30        if (!skip_prefix(refname, "refs/heads/", &refname))
  31                die(_("Expecting a full ref name, got %s"), refname);
  32
  33        strbuf_addf(&sb, "branch.%s.remote", refname);
  34        if (git_config_get_string(sb.buf, &dest))
  35                ret = xstrdup("origin");
  36        else
  37                ret = dest;
  38
  39        strbuf_release(&sb);
  40        return ret;
  41}
  42
  43static int starts_with_dot_slash(const char *str)
  44{
  45        return str[0] == '.' && is_dir_sep(str[1]);
  46}
  47
  48static int starts_with_dot_dot_slash(const char *str)
  49{
  50        return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
  51}
  52
  53/*
  54 * Returns 1 if it was the last chop before ':'.
  55 */
  56static int chop_last_dir(char **remoteurl, int is_relative)
  57{
  58        char *rfind = find_last_dir_sep(*remoteurl);
  59        if (rfind) {
  60                *rfind = '\0';
  61                return 0;
  62        }
  63
  64        rfind = strrchr(*remoteurl, ':');
  65        if (rfind) {
  66                *rfind = '\0';
  67                return 1;
  68        }
  69
  70        if (is_relative || !strcmp(".", *remoteurl))
  71                die(_("cannot strip one component off url '%s'"),
  72                        *remoteurl);
  73
  74        free(*remoteurl);
  75        *remoteurl = xstrdup(".");
  76        return 0;
  77}
  78
  79/*
  80 * The `url` argument is the URL that navigates to the submodule origin
  81 * repo. When relative, this URL is relative to the superproject origin
  82 * URL repo. The `up_path` argument, if specified, is the relative
  83 * path that navigates from the submodule working tree to the superproject
  84 * working tree. Returns the origin URL of the submodule.
  85 *
  86 * Return either an absolute URL or filesystem path (if the superproject
  87 * origin URL is an absolute URL or filesystem path, respectively) or a
  88 * relative file system path (if the superproject origin URL is a relative
  89 * file system path).
  90 *
  91 * When the output is a relative file system path, the path is either
  92 * relative to the submodule working tree, if up_path is specified, or to
  93 * the superproject working tree otherwise.
  94 *
  95 * NEEDSWORK: This works incorrectly on the domain and protocol part.
  96 * remote_url      url              outcome          expectation
  97 * http://a.com/b  ../c             http://a.com/c   as is
  98 * http://a.com/b  ../../c          http://c         error out
  99 * http://a.com/b  ../../../c       http:/c          error out
 100 * http://a.com/b  ../../../../c    http:c           error out
 101 * http://a.com/b  ../../../../../c    .:c           error out
 102 * NEEDSWORK: Given how chop_last_dir() works, this function is broken
 103 * when a local part has a colon in its path component, too.
 104 */
 105static char *relative_url(const char *remote_url,
 106                                const char *url,
 107                                const char *up_path)
 108{
 109        int is_relative = 0;
 110        int colonsep = 0;
 111        char *out;
 112        char *remoteurl = xstrdup(remote_url);
 113        struct strbuf sb = STRBUF_INIT;
 114        size_t len = strlen(remoteurl);
 115
 116        if (is_dir_sep(remoteurl[len]))
 117                remoteurl[len] = '\0';
 118
 119        if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
 120                is_relative = 0;
 121        else {
 122                is_relative = 1;
 123                /*
 124                 * Prepend a './' to ensure all relative
 125                 * remoteurls start with './' or '../'
 126                 */
 127                if (!starts_with_dot_slash(remoteurl) &&
 128                    !starts_with_dot_dot_slash(remoteurl)) {
 129                        strbuf_reset(&sb);
 130                        strbuf_addf(&sb, "./%s", remoteurl);
 131                        free(remoteurl);
 132                        remoteurl = strbuf_detach(&sb, NULL);
 133                }
 134        }
 135        /*
 136         * When the url starts with '../', remove that and the
 137         * last directory in remoteurl.
 138         */
 139        while (url) {
 140                if (starts_with_dot_dot_slash(url)) {
 141                        url += 3;
 142                        colonsep |= chop_last_dir(&remoteurl, is_relative);
 143                } else if (starts_with_dot_slash(url))
 144                        url += 2;
 145                else
 146                        break;
 147        }
 148        strbuf_reset(&sb);
 149        strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
 150        free(remoteurl);
 151
 152        if (starts_with_dot_slash(sb.buf))
 153                out = xstrdup(sb.buf + 2);
 154        else
 155                out = xstrdup(sb.buf);
 156        strbuf_reset(&sb);
 157
 158        if (!up_path || !is_relative)
 159                return out;
 160
 161        strbuf_addf(&sb, "%s%s", up_path, out);
 162        free(out);
 163        return strbuf_detach(&sb, NULL);
 164}
 165
 166static int resolve_relative_url(int argc, const char **argv, const char *prefix)
 167{
 168        char *remoteurl = NULL;
 169        char *remote = get_default_remote();
 170        const char *up_path = NULL;
 171        char *res;
 172        const char *url;
 173        struct strbuf sb = STRBUF_INIT;
 174
 175        if (argc != 2 && argc != 3)
 176                die("resolve-relative-url only accepts one or two arguments");
 177
 178        url = argv[1];
 179        strbuf_addf(&sb, "remote.%s.url", remote);
 180        free(remote);
 181
 182        if (git_config_get_string(sb.buf, &remoteurl))
 183                /* the repository is its own authoritative upstream */
 184                remoteurl = xgetcwd();
 185
 186        if (argc == 3)
 187                up_path = argv[2];
 188
 189        res = relative_url(remoteurl, url, up_path);
 190        puts(res);
 191        free(res);
 192        free(remoteurl);
 193        return 0;
 194}
 195
 196static int resolve_relative_url_test(int argc, const char **argv, const char *prefix)
 197{
 198        char *remoteurl, *res;
 199        const char *up_path, *url;
 200
 201        if (argc != 4)
 202                die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>");
 203
 204        up_path = argv[1];
 205        remoteurl = xstrdup(argv[2]);
 206        url = argv[3];
 207
 208        if (!strcmp(up_path, "(null)"))
 209                up_path = NULL;
 210
 211        res = relative_url(remoteurl, url, up_path);
 212        puts(res);
 213        free(res);
 214        free(remoteurl);
 215        return 0;
 216}
 217
 218struct module_list {
 219        const struct cache_entry **entries;
 220        int alloc, nr;
 221};
 222#define MODULE_LIST_INIT { NULL, 0, 0 }
 223
 224static int module_list_compute(int argc, const char **argv,
 225                               const char *prefix,
 226                               struct pathspec *pathspec,
 227                               struct module_list *list)
 228{
 229        int i, result = 0;
 230        char *ps_matched = NULL;
 231        parse_pathspec(pathspec, 0,
 232                       PATHSPEC_PREFER_FULL |
 233                       PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
 234                       prefix, argv);
 235
 236        if (pathspec->nr)
 237                ps_matched = xcalloc(pathspec->nr, 1);
 238
 239        if (read_cache() < 0)
 240                die(_("index file corrupt"));
 241
 242        for (i = 0; i < active_nr; i++) {
 243                const struct cache_entry *ce = active_cache[i];
 244
 245                if (!match_pathspec(pathspec, ce->name, ce_namelen(ce),
 246                                    0, ps_matched, 1) ||
 247                    !S_ISGITLINK(ce->ce_mode))
 248                        continue;
 249
 250                ALLOC_GROW(list->entries, list->nr + 1, list->alloc);
 251                list->entries[list->nr++] = ce;
 252                while (i + 1 < active_nr &&
 253                       !strcmp(ce->name, active_cache[i + 1]->name))
 254                        /*
 255                         * Skip entries with the same name in different stages
 256                         * to make sure an entry is returned only once.
 257                         */
 258                        i++;
 259        }
 260
 261        if (ps_matched && report_path_error(ps_matched, pathspec, prefix))
 262                result = -1;
 263
 264        free(ps_matched);
 265
 266        return result;
 267}
 268
 269static int module_list(int argc, const char **argv, const char *prefix)
 270{
 271        int i;
 272        struct pathspec pathspec;
 273        struct module_list list = MODULE_LIST_INIT;
 274
 275        struct option module_list_options[] = {
 276                OPT_STRING(0, "prefix", &prefix,
 277                           N_("path"),
 278                           N_("alternative anchor for relative paths")),
 279                OPT_END()
 280        };
 281
 282        const char *const git_submodule_helper_usage[] = {
 283                N_("git submodule--helper list [--prefix=<path>] [<path>...]"),
 284                NULL
 285        };
 286
 287        argc = parse_options(argc, argv, prefix, module_list_options,
 288                             git_submodule_helper_usage, 0);
 289
 290        if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
 291                return 1;
 292
 293        for (i = 0; i < list.nr; i++) {
 294                const struct cache_entry *ce = list.entries[i];
 295
 296                if (ce_stage(ce))
 297                        printf("%06o %s U\t", ce->ce_mode, sha1_to_hex(null_sha1));
 298                else
 299                        printf("%06o %s %d\t", ce->ce_mode,
 300                               oid_to_hex(&ce->oid), ce_stage(ce));
 301
 302                utf8_fprintf(stdout, "%s\n", ce->name);
 303        }
 304        return 0;
 305}
 306
 307static void init_submodule(const char *path, const char *prefix, int quiet)
 308{
 309        const struct submodule *sub;
 310        struct strbuf sb = STRBUF_INIT;
 311        char *upd = NULL, *url = NULL, *displaypath;
 312
 313        /* Only loads from .gitmodules, no overlay with .git/config */
 314        gitmodules_config();
 315
 316        if (prefix) {
 317                strbuf_addf(&sb, "%s%s", prefix, path);
 318                displaypath = strbuf_detach(&sb, NULL);
 319        } else
 320                displaypath = xstrdup(path);
 321
 322        sub = submodule_from_path(null_sha1, path);
 323
 324        if (!sub)
 325                die(_("No url found for submodule path '%s' in .gitmodules"),
 326                        displaypath);
 327
 328        /*
 329         * Copy url setting when it is not set yet.
 330         * To look up the url in .git/config, we must not fall back to
 331         * .gitmodules, so look it up directly.
 332         */
 333        strbuf_reset(&sb);
 334        strbuf_addf(&sb, "submodule.%s.url", sub->name);
 335        if (git_config_get_string(sb.buf, &url)) {
 336                url = xstrdup(sub->url);
 337
 338                if (!url)
 339                        die(_("No url found for submodule path '%s' in .gitmodules"),
 340                                displaypath);
 341
 342                /* Possibly a url relative to parent */
 343                if (starts_with_dot_dot_slash(url) ||
 344                    starts_with_dot_slash(url)) {
 345                        char *remoteurl, *relurl;
 346                        char *remote = get_default_remote();
 347                        struct strbuf remotesb = STRBUF_INIT;
 348                        strbuf_addf(&remotesb, "remote.%s.url", remote);
 349                        free(remote);
 350
 351                        if (git_config_get_string(remotesb.buf, &remoteurl))
 352                                /*
 353                                 * The repository is its own
 354                                 * authoritative upstream
 355                                 */
 356                                remoteurl = xgetcwd();
 357                        relurl = relative_url(remoteurl, url, NULL);
 358                        strbuf_release(&remotesb);
 359                        free(remoteurl);
 360                        free(url);
 361                        url = relurl;
 362                }
 363
 364                if (git_config_set_gently(sb.buf, url))
 365                        die(_("Failed to register url for submodule path '%s'"),
 366                            displaypath);
 367                if (!quiet)
 368                        fprintf(stderr,
 369                                _("Submodule '%s' (%s) registered for path '%s'\n"),
 370                                sub->name, url, displaypath);
 371        }
 372
 373        /* Copy "update" setting when it is not set yet */
 374        strbuf_reset(&sb);
 375        strbuf_addf(&sb, "submodule.%s.update", sub->name);
 376        if (git_config_get_string(sb.buf, &upd) &&
 377            sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
 378                if (sub->update_strategy.type == SM_UPDATE_COMMAND) {
 379                        fprintf(stderr, _("warning: command update mode suggested for submodule '%s'\n"),
 380                                sub->name);
 381                        upd = xstrdup("none");
 382                } else
 383                        upd = xstrdup(submodule_strategy_to_string(&sub->update_strategy));
 384
 385                if (git_config_set_gently(sb.buf, upd))
 386                        die(_("Failed to register update mode for submodule path '%s'"), displaypath);
 387        }
 388        strbuf_release(&sb);
 389        free(displaypath);
 390        free(url);
 391        free(upd);
 392}
 393
 394static int module_init(int argc, const char **argv, const char *prefix)
 395{
 396        struct pathspec pathspec;
 397        struct module_list list = MODULE_LIST_INIT;
 398        int quiet = 0;
 399        int i;
 400
 401        struct option module_init_options[] = {
 402                OPT_STRING(0, "prefix", &prefix,
 403                           N_("path"),
 404                           N_("alternative anchor for relative paths")),
 405                OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
 406                OPT_END()
 407        };
 408
 409        const char *const git_submodule_helper_usage[] = {
 410                N_("git submodule--helper init [<path>]"),
 411                NULL
 412        };
 413
 414        argc = parse_options(argc, argv, prefix, module_init_options,
 415                             git_submodule_helper_usage, 0);
 416
 417        if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
 418                return 1;
 419
 420        for (i = 0; i < list.nr; i++)
 421                init_submodule(list.entries[i]->name, prefix, quiet);
 422
 423        return 0;
 424}
 425
 426static int module_name(int argc, const char **argv, const char *prefix)
 427{
 428        const struct submodule *sub;
 429
 430        if (argc != 2)
 431                usage(_("git submodule--helper name <path>"));
 432
 433        gitmodules_config();
 434        sub = submodule_from_path(null_sha1, argv[1]);
 435
 436        if (!sub)
 437                die(_("no submodule mapping found in .gitmodules for path '%s'"),
 438                    argv[1]);
 439
 440        printf("%s\n", sub->name);
 441
 442        return 0;
 443}
 444
 445static int clone_submodule(const char *path, const char *gitdir, const char *url,
 446                           const char *depth, struct string_list *reference,
 447                           int quiet, int progress)
 448{
 449        struct child_process cp = CHILD_PROCESS_INIT;
 450
 451        argv_array_push(&cp.args, "clone");
 452        argv_array_push(&cp.args, "--no-checkout");
 453        if (quiet)
 454                argv_array_push(&cp.args, "--quiet");
 455        if (progress)
 456                argv_array_push(&cp.args, "--progress");
 457        if (depth && *depth)
 458                argv_array_pushl(&cp.args, "--depth", depth, NULL);
 459        if (reference->nr) {
 460                struct string_list_item *item;
 461                for_each_string_list_item(item, reference)
 462                        argv_array_pushl(&cp.args, "--reference",
 463                                         item->string, NULL);
 464        }
 465        if (gitdir && *gitdir)
 466                argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
 467
 468        argv_array_push(&cp.args, url);
 469        argv_array_push(&cp.args, path);
 470
 471        cp.git_cmd = 1;
 472        prepare_submodule_repo_env(&cp.env_array);
 473        cp.no_stdin = 1;
 474
 475        return run_command(&cp);
 476}
 477
 478struct submodule_alternate_setup {
 479        const char *submodule_name;
 480        enum SUBMODULE_ALTERNATE_ERROR_MODE {
 481                SUBMODULE_ALTERNATE_ERROR_DIE,
 482                SUBMODULE_ALTERNATE_ERROR_INFO,
 483                SUBMODULE_ALTERNATE_ERROR_IGNORE
 484        } error_mode;
 485        struct string_list *reference;
 486};
 487#define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
 488        SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
 489
 490static int add_possible_reference_from_superproject(
 491                struct alternate_object_database *alt, void *sas_cb)
 492{
 493        struct submodule_alternate_setup *sas = sas_cb;
 494
 495        /*
 496         * If the alternate object store is another repository, try the
 497         * standard layout with .git/modules/<name>/objects
 498         */
 499        if (ends_with(alt->path, ".git/objects")) {
 500                char *sm_alternate;
 501                struct strbuf sb = STRBUF_INIT;
 502                struct strbuf err = STRBUF_INIT;
 503                strbuf_add(&sb, alt->path, strlen(alt->path) - strlen("objects"));
 504
 505                /*
 506                 * We need to end the new path with '/' to mark it as a dir,
 507                 * otherwise a submodule name containing '/' will be broken
 508                 * as the last part of a missing submodule reference would
 509                 * be taken as a file name.
 510                 */
 511                strbuf_addf(&sb, "modules/%s/", sas->submodule_name);
 512
 513                sm_alternate = compute_alternate_path(sb.buf, &err);
 514                if (sm_alternate) {
 515                        string_list_append(sas->reference, xstrdup(sb.buf));
 516                        free(sm_alternate);
 517                } else {
 518                        switch (sas->error_mode) {
 519                        case SUBMODULE_ALTERNATE_ERROR_DIE:
 520                                die(_("submodule '%s' cannot add alternate: %s"),
 521                                    sas->submodule_name, err.buf);
 522                        case SUBMODULE_ALTERNATE_ERROR_INFO:
 523                                fprintf(stderr, _("submodule '%s' cannot add alternate: %s"),
 524                                        sas->submodule_name, err.buf);
 525                        case SUBMODULE_ALTERNATE_ERROR_IGNORE:
 526                                ; /* nothing */
 527                        }
 528                }
 529                strbuf_release(&sb);
 530        }
 531
 532        return 0;
 533}
 534
 535static void prepare_possible_alternates(const char *sm_name,
 536                struct string_list *reference)
 537{
 538        char *sm_alternate = NULL, *error_strategy = NULL;
 539        struct submodule_alternate_setup sas = SUBMODULE_ALTERNATE_SETUP_INIT;
 540
 541        git_config_get_string("submodule.alternateLocation", &sm_alternate);
 542        if (!sm_alternate)
 543                return;
 544
 545        git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
 546
 547        if (!error_strategy)
 548                error_strategy = xstrdup("die");
 549
 550        sas.submodule_name = sm_name;
 551        sas.reference = reference;
 552        if (!strcmp(error_strategy, "die"))
 553                sas.error_mode = SUBMODULE_ALTERNATE_ERROR_DIE;
 554        else if (!strcmp(error_strategy, "info"))
 555                sas.error_mode = SUBMODULE_ALTERNATE_ERROR_INFO;
 556        else if (!strcmp(error_strategy, "ignore"))
 557                sas.error_mode = SUBMODULE_ALTERNATE_ERROR_IGNORE;
 558        else
 559                die(_("Value '%s' for submodule.alternateErrorStrategy is not recognized"), error_strategy);
 560
 561        if (!strcmp(sm_alternate, "superproject"))
 562                foreach_alt_odb(add_possible_reference_from_superproject, &sas);
 563        else if (!strcmp(sm_alternate, "no"))
 564                ; /* do nothing */
 565        else
 566                die(_("Value '%s' for submodule.alternateLocation is not recognized"), sm_alternate);
 567
 568        free(sm_alternate);
 569        free(error_strategy);
 570}
 571
 572static int module_clone(int argc, const char **argv, const char *prefix)
 573{
 574        const char *name = NULL, *url = NULL, *depth = NULL;
 575        int quiet = 0;
 576        int progress = 0;
 577        FILE *submodule_dot_git;
 578        char *p, *path = NULL, *sm_gitdir;
 579        struct strbuf rel_path = STRBUF_INIT;
 580        struct strbuf sb = STRBUF_INIT;
 581        struct string_list reference = STRING_LIST_INIT_NODUP;
 582
 583        struct option module_clone_options[] = {
 584                OPT_STRING(0, "prefix", &prefix,
 585                           N_("path"),
 586                           N_("alternative anchor for relative paths")),
 587                OPT_STRING(0, "path", &path,
 588                           N_("path"),
 589                           N_("where the new submodule will be cloned to")),
 590                OPT_STRING(0, "name", &name,
 591                           N_("string"),
 592                           N_("name of the new submodule")),
 593                OPT_STRING(0, "url", &url,
 594                           N_("string"),
 595                           N_("url where to clone the submodule from")),
 596                OPT_STRING_LIST(0, "reference", &reference,
 597                           N_("repo"),
 598                           N_("reference repository")),
 599                OPT_STRING(0, "depth", &depth,
 600                           N_("string"),
 601                           N_("depth for shallow clones")),
 602                OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
 603                OPT_BOOL(0, "progress", &progress,
 604                           N_("force cloning progress")),
 605                OPT_END()
 606        };
 607
 608        const char *const git_submodule_helper_usage[] = {
 609                N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
 610                   "[--reference <repository>] [--name <name>] [--depth <depth>] "
 611                   "--url <url> --path <path>"),
 612                NULL
 613        };
 614
 615        argc = parse_options(argc, argv, prefix, module_clone_options,
 616                             git_submodule_helper_usage, 0);
 617
 618        if (argc || !url || !path || !*path)
 619                usage_with_options(git_submodule_helper_usage,
 620                                   module_clone_options);
 621
 622        strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
 623        sm_gitdir = xstrdup(absolute_path(sb.buf));
 624        strbuf_reset(&sb);
 625
 626        if (!is_absolute_path(path)) {
 627                strbuf_addf(&sb, "%s/%s", get_git_work_tree(), path);
 628                path = strbuf_detach(&sb, NULL);
 629        } else
 630                path = xstrdup(path);
 631
 632        if (!file_exists(sm_gitdir)) {
 633                if (safe_create_leading_directories_const(sm_gitdir) < 0)
 634                        die(_("could not create directory '%s'"), sm_gitdir);
 635
 636                prepare_possible_alternates(name, &reference);
 637
 638                if (clone_submodule(path, sm_gitdir, url, depth, &reference,
 639                                    quiet, progress))
 640                        die(_("clone of '%s' into submodule path '%s' failed"),
 641                            url, path);
 642        } else {
 643                if (safe_create_leading_directories_const(path) < 0)
 644                        die(_("could not create directory '%s'"), path);
 645                strbuf_addf(&sb, "%s/index", sm_gitdir);
 646                unlink_or_warn(sb.buf);
 647                strbuf_reset(&sb);
 648        }
 649
 650        /* Write a .git file in the submodule to redirect to the superproject. */
 651        strbuf_addf(&sb, "%s/.git", path);
 652        if (safe_create_leading_directories_const(sb.buf) < 0)
 653                die(_("could not create leading directories of '%s'"), sb.buf);
 654        submodule_dot_git = fopen(sb.buf, "w");
 655        if (!submodule_dot_git)
 656                die_errno(_("cannot open file '%s'"), sb.buf);
 657
 658        fprintf_or_die(submodule_dot_git, "gitdir: %s\n",
 659                       relative_path(sm_gitdir, path, &rel_path));
 660        if (fclose(submodule_dot_git))
 661                die(_("could not close file %s"), sb.buf);
 662        strbuf_reset(&sb);
 663        strbuf_reset(&rel_path);
 664
 665        /* Redirect the worktree of the submodule in the superproject's config */
 666        p = git_pathdup_submodule(path, "config");
 667        if (!p)
 668                die(_("could not get submodule directory for '%s'"), path);
 669        git_config_set_in_file(p, "core.worktree",
 670                               relative_path(path, sm_gitdir, &rel_path));
 671        strbuf_release(&sb);
 672        strbuf_release(&rel_path);
 673        free(sm_gitdir);
 674        free(path);
 675        free(p);
 676        return 0;
 677}
 678
 679struct submodule_update_clone {
 680        /* index into 'list', the list of submodules to look into for cloning */
 681        int current;
 682        struct module_list list;
 683        unsigned warn_if_uninitialized : 1;
 684
 685        /* update parameter passed via commandline */
 686        struct submodule_update_strategy update;
 687
 688        /* configuration parameters which are passed on to the children */
 689        int progress;
 690        int quiet;
 691        int recommend_shallow;
 692        struct string_list references;
 693        const char *depth;
 694        const char *recursive_prefix;
 695        const char *prefix;
 696
 697        /* Machine-readable status lines to be consumed by git-submodule.sh */
 698        struct string_list projectlines;
 699
 700        /* If we want to stop as fast as possible and return an error */
 701        unsigned quickstop : 1;
 702
 703        /* failed clones to be retried again */
 704        const struct cache_entry **failed_clones;
 705        int failed_clones_nr, failed_clones_alloc;
 706};
 707#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
 708        SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, \
 709        NULL, NULL, NULL, \
 710        STRING_LIST_INIT_DUP, 0, NULL, 0, 0}
 711
 712
 713static void next_submodule_warn_missing(struct submodule_update_clone *suc,
 714                struct strbuf *out, const char *displaypath)
 715{
 716        /*
 717         * Only mention uninitialized submodules when their
 718         * paths have been specified.
 719         */
 720        if (suc->warn_if_uninitialized) {
 721                strbuf_addf(out,
 722                        _("Submodule path '%s' not initialized"),
 723                        displaypath);
 724                strbuf_addch(out, '\n');
 725                strbuf_addstr(out,
 726                        _("Maybe you want to use 'update --init'?"));
 727                strbuf_addch(out, '\n');
 728        }
 729}
 730
 731/**
 732 * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to
 733 * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise.
 734 */
 735static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 736                                           struct child_process *child,
 737                                           struct submodule_update_clone *suc,
 738                                           struct strbuf *out)
 739{
 740        const struct submodule *sub = NULL;
 741        struct strbuf displaypath_sb = STRBUF_INIT;
 742        struct strbuf sb = STRBUF_INIT;
 743        const char *displaypath = NULL;
 744        char *url = NULL;
 745        int needs_cloning = 0;
 746
 747        if (ce_stage(ce)) {
 748                if (suc->recursive_prefix)
 749                        strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name);
 750                else
 751                        strbuf_addstr(&sb, ce->name);
 752                strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf);
 753                strbuf_addch(out, '\n');
 754                goto cleanup;
 755        }
 756
 757        sub = submodule_from_path(null_sha1, ce->name);
 758
 759        if (suc->recursive_prefix)
 760                displaypath = relative_path(suc->recursive_prefix,
 761                                            ce->name, &displaypath_sb);
 762        else
 763                displaypath = ce->name;
 764
 765        if (!sub) {
 766                next_submodule_warn_missing(suc, out, displaypath);
 767                goto cleanup;
 768        }
 769
 770        if (suc->update.type == SM_UPDATE_NONE
 771            || (suc->update.type == SM_UPDATE_UNSPECIFIED
 772                && sub->update_strategy.type == SM_UPDATE_NONE)) {
 773                strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
 774                strbuf_addch(out, '\n');
 775                goto cleanup;
 776        }
 777
 778        /*
 779         * Looking up the url in .git/config.
 780         * We must not fall back to .gitmodules as we only want
 781         * to process configured submodules.
 782         */
 783        strbuf_reset(&sb);
 784        strbuf_addf(&sb, "submodule.%s.url", sub->name);
 785        git_config_get_string(sb.buf, &url);
 786        if (!url) {
 787                next_submodule_warn_missing(suc, out, displaypath);
 788                goto cleanup;
 789        }
 790
 791        strbuf_reset(&sb);
 792        strbuf_addf(&sb, "%s/.git", ce->name);
 793        needs_cloning = !file_exists(sb.buf);
 794
 795        strbuf_reset(&sb);
 796        strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode,
 797                        oid_to_hex(&ce->oid), ce_stage(ce),
 798                        needs_cloning, ce->name);
 799        string_list_append(&suc->projectlines, sb.buf);
 800
 801        if (!needs_cloning)
 802                goto cleanup;
 803
 804        child->git_cmd = 1;
 805        child->no_stdin = 1;
 806        child->stdout_to_stderr = 1;
 807        child->err = -1;
 808        argv_array_push(&child->args, "submodule--helper");
 809        argv_array_push(&child->args, "clone");
 810        if (suc->progress)
 811                argv_array_push(&child->args, "--progress");
 812        if (suc->quiet)
 813                argv_array_push(&child->args, "--quiet");
 814        if (suc->prefix)
 815                argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
 816        if (suc->recommend_shallow && sub->recommend_shallow == 1)
 817                argv_array_push(&child->args, "--depth=1");
 818        argv_array_pushl(&child->args, "--path", sub->path, NULL);
 819        argv_array_pushl(&child->args, "--name", sub->name, NULL);
 820        argv_array_pushl(&child->args, "--url", url, NULL);
 821        if (suc->references.nr) {
 822                struct string_list_item *item;
 823                for_each_string_list_item(item, &suc->references)
 824                        argv_array_pushl(&child->args, "--reference", item->string, NULL);
 825        }
 826        if (suc->depth)
 827                argv_array_push(&child->args, suc->depth);
 828
 829cleanup:
 830        free(url);
 831        strbuf_reset(&displaypath_sb);
 832        strbuf_reset(&sb);
 833
 834        return needs_cloning;
 835}
 836
 837static int update_clone_get_next_task(struct child_process *child,
 838                                      struct strbuf *err,
 839                                      void *suc_cb,
 840                                      void **idx_task_cb)
 841{
 842        struct submodule_update_clone *suc = suc_cb;
 843        const struct cache_entry *ce;
 844        int index;
 845
 846        for (; suc->current < suc->list.nr; suc->current++) {
 847                ce = suc->list.entries[suc->current];
 848                if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
 849                        int *p = xmalloc(sizeof(*p));
 850                        *p = suc->current;
 851                        *idx_task_cb = p;
 852                        suc->current++;
 853                        return 1;
 854                }
 855        }
 856
 857        /*
 858         * The loop above tried cloning each submodule once, now try the
 859         * stragglers again, which we can imagine as an extension of the
 860         * entry list.
 861         */
 862        index = suc->current - suc->list.nr;
 863        if (index < suc->failed_clones_nr) {
 864                int *p;
 865                ce = suc->failed_clones[index];
 866                if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
 867                        suc->current ++;
 868                        strbuf_addstr(err, "BUG: submodule considered for "
 869                                           "cloning, doesn't need cloning "
 870                                           "any more?\n");
 871                        return 0;
 872                }
 873                p = xmalloc(sizeof(*p));
 874                *p = suc->current;
 875                *idx_task_cb = p;
 876                suc->current ++;
 877                return 1;
 878        }
 879
 880        return 0;
 881}
 882
 883static int update_clone_start_failure(struct strbuf *err,
 884                                      void *suc_cb,
 885                                      void *idx_task_cb)
 886{
 887        struct submodule_update_clone *suc = suc_cb;
 888        suc->quickstop = 1;
 889        return 1;
 890}
 891
 892static int update_clone_task_finished(int result,
 893                                      struct strbuf *err,
 894                                      void *suc_cb,
 895                                      void *idx_task_cb)
 896{
 897        const struct cache_entry *ce;
 898        struct submodule_update_clone *suc = suc_cb;
 899
 900        int *idxP = *(int**)idx_task_cb;
 901        int idx = *idxP;
 902        free(idxP);
 903
 904        if (!result)
 905                return 0;
 906
 907        if (idx < suc->list.nr) {
 908                ce  = suc->list.entries[idx];
 909                strbuf_addf(err, _("Failed to clone '%s'. Retry scheduled"),
 910                            ce->name);
 911                strbuf_addch(err, '\n');
 912                ALLOC_GROW(suc->failed_clones,
 913                           suc->failed_clones_nr + 1,
 914                           suc->failed_clones_alloc);
 915                suc->failed_clones[suc->failed_clones_nr++] = ce;
 916                return 0;
 917        } else {
 918                idx -= suc->list.nr;
 919                ce  = suc->failed_clones[idx];
 920                strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"),
 921                            ce->name);
 922                strbuf_addch(err, '\n');
 923                suc->quickstop = 1;
 924                return 1;
 925        }
 926
 927        return 0;
 928}
 929
 930static int update_clone(int argc, const char **argv, const char *prefix)
 931{
 932        const char *update = NULL;
 933        int max_jobs = -1;
 934        struct string_list_item *item;
 935        struct pathspec pathspec;
 936        struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
 937
 938        struct option module_update_clone_options[] = {
 939                OPT_STRING(0, "prefix", &prefix,
 940                           N_("path"),
 941                           N_("path into the working tree")),
 942                OPT_STRING(0, "recursive-prefix", &suc.recursive_prefix,
 943                           N_("path"),
 944                           N_("path into the working tree, across nested "
 945                              "submodule boundaries")),
 946                OPT_STRING(0, "update", &update,
 947                           N_("string"),
 948                           N_("rebase, merge, checkout or none")),
 949                OPT_STRING_LIST(0, "reference", &suc.references, N_("repo"),
 950                           N_("reference repository")),
 951                OPT_STRING(0, "depth", &suc.depth, "<depth>",
 952                           N_("Create a shallow clone truncated to the "
 953                              "specified number of revisions")),
 954                OPT_INTEGER('j', "jobs", &max_jobs,
 955                            N_("parallel jobs")),
 956                OPT_BOOL(0, "recommend-shallow", &suc.recommend_shallow,
 957                            N_("whether the initial clone should follow the shallow recommendation")),
 958                OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
 959                OPT_BOOL(0, "progress", &suc.progress,
 960                            N_("force cloning progress")),
 961                OPT_END()
 962        };
 963
 964        const char *const git_submodule_helper_usage[] = {
 965                N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"),
 966                NULL
 967        };
 968        suc.prefix = prefix;
 969
 970        argc = parse_options(argc, argv, prefix, module_update_clone_options,
 971                             git_submodule_helper_usage, 0);
 972
 973        if (update)
 974                if (parse_submodule_update_strategy(update, &suc.update) < 0)
 975                        die(_("bad value for update parameter"));
 976
 977        if (module_list_compute(argc, argv, prefix, &pathspec, &suc.list) < 0)
 978                return 1;
 979
 980        if (pathspec.nr)
 981                suc.warn_if_uninitialized = 1;
 982
 983        /* Overlay the parsed .gitmodules file with .git/config */
 984        gitmodules_config();
 985        git_config(submodule_config, NULL);
 986
 987        if (max_jobs < 0)
 988                max_jobs = parallel_submodules();
 989
 990        run_processes_parallel(max_jobs,
 991                               update_clone_get_next_task,
 992                               update_clone_start_failure,
 993                               update_clone_task_finished,
 994                               &suc);
 995
 996        /*
 997         * We saved the output and put it out all at once now.
 998         * That means:
 999         * - the listener does not have to interleave their (checkout)
1000         *   work with our fetching.  The writes involved in a
1001         *   checkout involve more straightforward sequential I/O.
1002         * - the listener can avoid doing any work if fetching failed.
1003         */
1004        if (suc.quickstop)
1005                return 1;
1006
1007        for_each_string_list_item(item, &suc.projectlines)
1008                utf8_fprintf(stdout, "%s", item->string);
1009
1010        return 0;
1011}
1012
1013static int resolve_relative_path(int argc, const char **argv, const char *prefix)
1014{
1015        struct strbuf sb = STRBUF_INIT;
1016        if (argc != 3)
1017                die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc);
1018
1019        printf("%s", relative_path(argv[1], argv[2], &sb));
1020        strbuf_release(&sb);
1021        return 0;
1022}
1023
1024static const char *remote_submodule_branch(const char *path)
1025{
1026        const struct submodule *sub;
1027        gitmodules_config();
1028        git_config(submodule_config, NULL);
1029
1030        sub = submodule_from_path(null_sha1, path);
1031        if (!sub)
1032                return NULL;
1033
1034        if (!sub->branch)
1035                return "master";
1036
1037        if (!strcmp(sub->branch, ".")) {
1038                unsigned char sha1[20];
1039                const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
1040
1041                if (!refname)
1042                        die(_("No such ref: %s"), "HEAD");
1043
1044                /* detached HEAD */
1045                if (!strcmp(refname, "HEAD"))
1046                        die(_("Submodule (%s) branch configured to inherit "
1047                              "branch from superproject, but the superproject "
1048                              "is not on any branch"), sub->name);
1049
1050                if (!skip_prefix(refname, "refs/heads/", &refname))
1051                        die(_("Expecting a full ref name, got %s"), refname);
1052                return refname;
1053        }
1054
1055        return sub->branch;
1056}
1057
1058static int resolve_remote_submodule_branch(int argc, const char **argv,
1059                const char *prefix)
1060{
1061        const char *ret;
1062        struct strbuf sb = STRBUF_INIT;
1063        if (argc != 2)
1064                die("submodule--helper remote-branch takes exactly one arguments, got %d", argc);
1065
1066        ret = remote_submodule_branch(argv[1]);
1067        if (!ret)
1068                die("submodule %s doesn't exist", argv[1]);
1069
1070        printf("%s", ret);
1071        strbuf_release(&sb);
1072        return 0;
1073}
1074
1075struct cmd_struct {
1076        const char *cmd;
1077        int (*fn)(int, const char **, const char *);
1078};
1079
1080static struct cmd_struct commands[] = {
1081        {"list", module_list},
1082        {"name", module_name},
1083        {"clone", module_clone},
1084        {"update-clone", update_clone},
1085        {"relative-path", resolve_relative_path},
1086        {"resolve-relative-url", resolve_relative_url},
1087        {"resolve-relative-url-test", resolve_relative_url_test},
1088        {"init", module_init},
1089        {"remote-branch", resolve_remote_submodule_branch}
1090};
1091
1092int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
1093{
1094        int i;
1095        if (argc < 2)
1096                die(_("submodule--helper subcommand must be "
1097                      "called with a subcommand"));
1098
1099        for (i = 0; i < ARRAY_SIZE(commands); i++)
1100                if (!strcmp(argv[1], commands[i].cmd))
1101                        return commands[i].fn(argc - 1, argv + 1, prefix);
1102
1103        die(_("'%s' is not a valid submodule--helper "
1104              "subcommand"), argv[1]);
1105}