submodule.con commit Merge branch 'ma/sequencer-do-reset-saner-loop-termination' (daa8282)
   1#define NO_THE_INDEX_COMPATIBILITY_MACROS
   2
   3#include "cache.h"
   4#include "repository.h"
   5#include "config.h"
   6#include "submodule-config.h"
   7#include "submodule.h"
   8#include "dir.h"
   9#include "diff.h"
  10#include "commit.h"
  11#include "revision.h"
  12#include "run-command.h"
  13#include "diffcore.h"
  14#include "refs.h"
  15#include "string-list.h"
  16#include "sha1-array.h"
  17#include "argv-array.h"
  18#include "blob.h"
  19#include "thread-utils.h"
  20#include "quote.h"
  21#include "remote.h"
  22#include "worktree.h"
  23#include "parse-options.h"
  24#include "object-store.h"
  25#include "commit-reach.h"
  26
  27static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
  28static struct string_list changed_submodule_names = STRING_LIST_INIT_DUP;
  29static int initialized_fetch_ref_tips;
  30static struct oid_array ref_tips_before_fetch;
  31static struct oid_array ref_tips_after_fetch;
  32
  33/*
  34 * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
  35 * will be disabled because we can't guess what might be configured in
  36 * .gitmodules unless the user resolves the conflict.
  37 */
  38int is_gitmodules_unmerged(const struct index_state *istate)
  39{
  40        int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
  41        if (pos < 0) { /* .gitmodules not found or isn't merged */
  42                pos = -1 - pos;
  43                if (istate->cache_nr > pos) {  /* there is a .gitmodules */
  44                        const struct cache_entry *ce = istate->cache[pos];
  45                        if (ce_namelen(ce) == strlen(GITMODULES_FILE) &&
  46                            !strcmp(ce->name, GITMODULES_FILE))
  47                                return 1;
  48                }
  49        }
  50
  51        return 0;
  52}
  53
  54/*
  55 * Check if the .gitmodules file has unstaged modifications.  This must be
  56 * checked before allowing modifications to the .gitmodules file with the
  57 * intention to stage them later, because when continuing we would stage the
  58 * modifications the user didn't stage herself too. That might change in a
  59 * future version when we learn to stage the changes we do ourselves without
  60 * staging any previous modifications.
  61 */
  62int is_staging_gitmodules_ok(struct index_state *istate)
  63{
  64        int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
  65
  66        if ((pos >= 0) && (pos < istate->cache_nr)) {
  67                struct stat st;
  68                if (lstat(GITMODULES_FILE, &st) == 0 &&
  69                    ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
  70                        return 0;
  71        }
  72
  73        return 1;
  74}
  75
  76static int for_each_remote_ref_submodule(const char *submodule,
  77                                         each_ref_fn fn, void *cb_data)
  78{
  79        return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
  80                                        fn, cb_data);
  81}
  82
  83/*
  84 * Try to update the "path" entry in the "submodule.<name>" section of the
  85 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
  86 * with the correct path=<oldpath> setting was found and we could update it.
  87 */
  88int update_path_in_gitmodules(const char *oldpath, const char *newpath)
  89{
  90        struct strbuf entry = STRBUF_INIT;
  91        const struct submodule *submodule;
  92
  93        if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
  94                return -1;
  95
  96        if (is_gitmodules_unmerged(the_repository->index))
  97                die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
  98
  99        submodule = submodule_from_path(the_repository, &null_oid, oldpath);
 100        if (!submodule || !submodule->name) {
 101                warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
 102                return -1;
 103        }
 104        strbuf_addstr(&entry, "submodule.");
 105        strbuf_addstr(&entry, submodule->name);
 106        strbuf_addstr(&entry, ".path");
 107        if (git_config_set_in_file_gently(GITMODULES_FILE, entry.buf, newpath) < 0) {
 108                /* Maybe the user already did that, don't error out here */
 109                warning(_("Could not update .gitmodules entry %s"), entry.buf);
 110                strbuf_release(&entry);
 111                return -1;
 112        }
 113        strbuf_release(&entry);
 114        return 0;
 115}
 116
 117/*
 118 * Try to remove the "submodule.<name>" section from .gitmodules where the given
 119 * path is configured. Return 0 only if a .gitmodules file was found, a section
 120 * with the correct path=<path> setting was found and we could remove it.
 121 */
 122int remove_path_from_gitmodules(const char *path)
 123{
 124        struct strbuf sect = STRBUF_INIT;
 125        const struct submodule *submodule;
 126
 127        if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
 128                return -1;
 129
 130        if (is_gitmodules_unmerged(the_repository->index))
 131                die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
 132
 133        submodule = submodule_from_path(the_repository, &null_oid, path);
 134        if (!submodule || !submodule->name) {
 135                warning(_("Could not find section in .gitmodules where path=%s"), path);
 136                return -1;
 137        }
 138        strbuf_addstr(&sect, "submodule.");
 139        strbuf_addstr(&sect, submodule->name);
 140        if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) {
 141                /* Maybe the user already did that, don't error out here */
 142                warning(_("Could not remove .gitmodules entry for %s"), path);
 143                strbuf_release(&sect);
 144                return -1;
 145        }
 146        strbuf_release(&sect);
 147        return 0;
 148}
 149
 150void stage_updated_gitmodules(struct index_state *istate)
 151{
 152        if (add_file_to_index(istate, GITMODULES_FILE, 0))
 153                die(_("staging updated .gitmodules failed"));
 154}
 155
 156/* TODO: remove this function, use repo_submodule_init instead. */
 157int add_submodule_odb(const char *path)
 158{
 159        struct strbuf objects_directory = STRBUF_INIT;
 160        int ret = 0;
 161
 162        ret = strbuf_git_path_submodule(&objects_directory, path, "objects/");
 163        if (ret)
 164                goto done;
 165        if (!is_directory(objects_directory.buf)) {
 166                ret = -1;
 167                goto done;
 168        }
 169        add_to_alternates_memory(objects_directory.buf);
 170done:
 171        strbuf_release(&objects_directory);
 172        return ret;
 173}
 174
 175void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
 176                                             const char *path)
 177{
 178        const struct submodule *submodule = submodule_from_path(the_repository,
 179                                                                &null_oid, path);
 180        if (submodule) {
 181                const char *ignore;
 182                char *key;
 183
 184                key = xstrfmt("submodule.%s.ignore", submodule->name);
 185                if (repo_config_get_string_const(the_repository, key, &ignore))
 186                        ignore = submodule->ignore;
 187                free(key);
 188
 189                if (ignore)
 190                        handle_ignore_submodules_arg(diffopt, ignore);
 191                else if (is_gitmodules_unmerged(the_repository->index))
 192                        diffopt->flags.ignore_submodules = 1;
 193        }
 194}
 195
 196/* Cheap function that only determines if we're interested in submodules at all */
 197int git_default_submodule_config(const char *var, const char *value, void *cb)
 198{
 199        if (!strcmp(var, "submodule.recurse")) {
 200                int v = git_config_bool(var, value) ?
 201                        RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
 202                config_update_recurse_submodules = v;
 203        }
 204        return 0;
 205}
 206
 207int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
 208                                                     const char *arg, int unset)
 209{
 210        if (unset) {
 211                config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
 212                return 0;
 213        }
 214        if (arg)
 215                config_update_recurse_submodules =
 216                        parse_update_recurse_submodules_arg(opt->long_name,
 217                                                            arg);
 218        else
 219                config_update_recurse_submodules = RECURSE_SUBMODULES_ON;
 220
 221        return 0;
 222}
 223
 224/*
 225 * Determine if a submodule has been initialized at a given 'path'
 226 */
 227int is_submodule_active(struct repository *repo, const char *path)
 228{
 229        int ret = 0;
 230        char *key = NULL;
 231        char *value = NULL;
 232        const struct string_list *sl;
 233        const struct submodule *module;
 234
 235        module = submodule_from_path(repo, &null_oid, path);
 236
 237        /* early return if there isn't a path->module mapping */
 238        if (!module)
 239                return 0;
 240
 241        /* submodule.<name>.active is set */
 242        key = xstrfmt("submodule.%s.active", module->name);
 243        if (!repo_config_get_bool(repo, key, &ret)) {
 244                free(key);
 245                return ret;
 246        }
 247        free(key);
 248
 249        /* submodule.active is set */
 250        sl = repo_config_get_value_multi(repo, "submodule.active");
 251        if (sl) {
 252                struct pathspec ps;
 253                struct argv_array args = ARGV_ARRAY_INIT;
 254                const struct string_list_item *item;
 255
 256                for_each_string_list_item(item, sl) {
 257                        argv_array_push(&args, item->string);
 258                }
 259
 260                parse_pathspec(&ps, 0, 0, NULL, args.argv);
 261                ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
 262
 263                argv_array_clear(&args);
 264                clear_pathspec(&ps);
 265                return ret;
 266        }
 267
 268        /* fallback to checking if the URL is set */
 269        key = xstrfmt("submodule.%s.url", module->name);
 270        ret = !repo_config_get_string(repo, key, &value);
 271
 272        free(value);
 273        free(key);
 274        return ret;
 275}
 276
 277int is_submodule_populated_gently(const char *path, int *return_error_code)
 278{
 279        int ret = 0;
 280        char *gitdir = xstrfmt("%s/.git", path);
 281
 282        if (resolve_gitdir_gently(gitdir, return_error_code))
 283                ret = 1;
 284
 285        free(gitdir);
 286        return ret;
 287}
 288
 289/*
 290 * Dies if the provided 'prefix' corresponds to an unpopulated submodule
 291 */
 292void die_in_unpopulated_submodule(const struct index_state *istate,
 293                                  const char *prefix)
 294{
 295        int i, prefixlen;
 296
 297        if (!prefix)
 298                return;
 299
 300        prefixlen = strlen(prefix);
 301
 302        for (i = 0; i < istate->cache_nr; i++) {
 303                struct cache_entry *ce = istate->cache[i];
 304                int ce_len = ce_namelen(ce);
 305
 306                if (!S_ISGITLINK(ce->ce_mode))
 307                        continue;
 308                if (prefixlen <= ce_len)
 309                        continue;
 310                if (strncmp(ce->name, prefix, ce_len))
 311                        continue;
 312                if (prefix[ce_len] != '/')
 313                        continue;
 314
 315                die(_("in unpopulated submodule '%s'"), ce->name);
 316        }
 317}
 318
 319/*
 320 * Dies if any paths in the provided pathspec descends into a submodule
 321 */
 322void die_path_inside_submodule(const struct index_state *istate,
 323                               const struct pathspec *ps)
 324{
 325        int i, j;
 326
 327        for (i = 0; i < istate->cache_nr; i++) {
 328                struct cache_entry *ce = istate->cache[i];
 329                int ce_len = ce_namelen(ce);
 330
 331                if (!S_ISGITLINK(ce->ce_mode))
 332                        continue;
 333
 334                for (j = 0; j < ps->nr ; j++) {
 335                        const struct pathspec_item *item = &ps->items[j];
 336
 337                        if (item->len <= ce_len)
 338                                continue;
 339                        if (item->match[ce_len] != '/')
 340                                continue;
 341                        if (strncmp(ce->name, item->match, ce_len))
 342                                continue;
 343                        if (item->len == ce_len + 1)
 344                                continue;
 345
 346                        die(_("Pathspec '%s' is in submodule '%.*s'"),
 347                            item->original, ce_len, ce->name);
 348                }
 349        }
 350}
 351
 352enum submodule_update_type parse_submodule_update_type(const char *value)
 353{
 354        if (!strcmp(value, "none"))
 355                return SM_UPDATE_NONE;
 356        else if (!strcmp(value, "checkout"))
 357                return SM_UPDATE_CHECKOUT;
 358        else if (!strcmp(value, "rebase"))
 359                return SM_UPDATE_REBASE;
 360        else if (!strcmp(value, "merge"))
 361                return SM_UPDATE_MERGE;
 362        else if (*value == '!')
 363                return SM_UPDATE_COMMAND;
 364        else
 365                return SM_UPDATE_UNSPECIFIED;
 366}
 367
 368int parse_submodule_update_strategy(const char *value,
 369                struct submodule_update_strategy *dst)
 370{
 371        enum submodule_update_type type;
 372
 373        free((void*)dst->command);
 374        dst->command = NULL;
 375
 376        type = parse_submodule_update_type(value);
 377        if (type == SM_UPDATE_UNSPECIFIED)
 378                return -1;
 379
 380        dst->type = type;
 381        if (type == SM_UPDATE_COMMAND)
 382                dst->command = xstrdup(value + 1);
 383
 384        return 0;
 385}
 386
 387const char *submodule_strategy_to_string(const struct submodule_update_strategy *s)
 388{
 389        struct strbuf sb = STRBUF_INIT;
 390        switch (s->type) {
 391        case SM_UPDATE_CHECKOUT:
 392                return "checkout";
 393        case SM_UPDATE_MERGE:
 394                return "merge";
 395        case SM_UPDATE_REBASE:
 396                return "rebase";
 397        case SM_UPDATE_NONE:
 398                return "none";
 399        case SM_UPDATE_UNSPECIFIED:
 400                return NULL;
 401        case SM_UPDATE_COMMAND:
 402                strbuf_addf(&sb, "!%s", s->command);
 403                return strbuf_detach(&sb, NULL);
 404        }
 405        return NULL;
 406}
 407
 408void handle_ignore_submodules_arg(struct diff_options *diffopt,
 409                                  const char *arg)
 410{
 411        diffopt->flags.ignore_submodules = 0;
 412        diffopt->flags.ignore_untracked_in_submodules = 0;
 413        diffopt->flags.ignore_dirty_submodules = 0;
 414
 415        if (!strcmp(arg, "all"))
 416                diffopt->flags.ignore_submodules = 1;
 417        else if (!strcmp(arg, "untracked"))
 418                diffopt->flags.ignore_untracked_in_submodules = 1;
 419        else if (!strcmp(arg, "dirty"))
 420                diffopt->flags.ignore_dirty_submodules = 1;
 421        else if (strcmp(arg, "none"))
 422                die("bad --ignore-submodules argument: %s", arg);
 423}
 424
 425static int prepare_submodule_summary(struct rev_info *rev, const char *path,
 426                struct commit *left, struct commit *right,
 427                struct commit_list *merge_bases)
 428{
 429        struct commit_list *list;
 430
 431        repo_init_revisions(the_repository, rev, NULL);
 432        setup_revisions(0, NULL, rev, NULL);
 433        rev->left_right = 1;
 434        rev->first_parent_only = 1;
 435        left->object.flags |= SYMMETRIC_LEFT;
 436        add_pending_object(rev, &left->object, path);
 437        add_pending_object(rev, &right->object, path);
 438        for (list = merge_bases; list; list = list->next) {
 439                list->item->object.flags |= UNINTERESTING;
 440                add_pending_object(rev, &list->item->object,
 441                        oid_to_hex(&list->item->object.oid));
 442        }
 443        return prepare_revision_walk(rev);
 444}
 445
 446static void print_submodule_summary(struct rev_info *rev, struct diff_options *o)
 447{
 448        static const char format[] = "  %m %s";
 449        struct strbuf sb = STRBUF_INIT;
 450        struct commit *commit;
 451
 452        while ((commit = get_revision(rev))) {
 453                struct pretty_print_context ctx = {0};
 454                ctx.date_mode = rev->date_mode;
 455                ctx.output_encoding = get_log_output_encoding();
 456                strbuf_setlen(&sb, 0);
 457                format_commit_message(commit, format, &sb, &ctx);
 458                strbuf_addch(&sb, '\n');
 459                if (commit->object.flags & SYMMETRIC_LEFT)
 460                        diff_emit_submodule_del(o, sb.buf);
 461                else
 462                        diff_emit_submodule_add(o, sb.buf);
 463        }
 464        strbuf_release(&sb);
 465}
 466
 467static void prepare_submodule_repo_env_no_git_dir(struct argv_array *out)
 468{
 469        const char * const *var;
 470
 471        for (var = local_repo_env; *var; var++) {
 472                if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))
 473                        argv_array_push(out, *var);
 474        }
 475}
 476
 477void prepare_submodule_repo_env(struct argv_array *out)
 478{
 479        prepare_submodule_repo_env_no_git_dir(out);
 480        argv_array_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT,
 481                         DEFAULT_GIT_DIR_ENVIRONMENT);
 482}
 483
 484/* Helper function to display the submodule header line prior to the full
 485 * summary output. If it can locate the submodule objects directory it will
 486 * attempt to lookup both the left and right commits and put them into the
 487 * left and right pointers.
 488 */
 489static void show_submodule_header(struct diff_options *o, const char *path,
 490                struct object_id *one, struct object_id *two,
 491                unsigned dirty_submodule,
 492                struct commit **left, struct commit **right,
 493                struct commit_list **merge_bases)
 494{
 495        const char *message = NULL;
 496        struct strbuf sb = STRBUF_INIT;
 497        int fast_forward = 0, fast_backward = 0;
 498
 499        if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
 500                diff_emit_submodule_untracked(o, path);
 501
 502        if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
 503                diff_emit_submodule_modified(o, path);
 504
 505        if (is_null_oid(one))
 506                message = "(new submodule)";
 507        else if (is_null_oid(two))
 508                message = "(submodule deleted)";
 509
 510        if (add_submodule_odb(path)) {
 511                if (!message)
 512                        message = "(commits not present)";
 513                goto output_header;
 514        }
 515
 516        /*
 517         * Attempt to lookup the commit references, and determine if this is
 518         * a fast forward or fast backwards update.
 519         */
 520        *left = lookup_commit_reference(the_repository, one);
 521        *right = lookup_commit_reference(the_repository, two);
 522
 523        /*
 524         * Warn about missing commits in the submodule project, but only if
 525         * they aren't null.
 526         */
 527        if ((!is_null_oid(one) && !*left) ||
 528             (!is_null_oid(two) && !*right))
 529                message = "(commits not present)";
 530
 531        *merge_bases = get_merge_bases(*left, *right);
 532        if (*merge_bases) {
 533                if ((*merge_bases)->item == *left)
 534                        fast_forward = 1;
 535                else if ((*merge_bases)->item == *right)
 536                        fast_backward = 1;
 537        }
 538
 539        if (oideq(one, two)) {
 540                strbuf_release(&sb);
 541                return;
 542        }
 543
 544output_header:
 545        strbuf_addf(&sb, "Submodule %s ", path);
 546        strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
 547        strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
 548        strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
 549        if (message)
 550                strbuf_addf(&sb, " %s\n", message);
 551        else
 552                strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
 553        diff_emit_submodule_header(o, sb.buf);
 554
 555        strbuf_release(&sb);
 556}
 557
 558void show_submodule_summary(struct diff_options *o, const char *path,
 559                struct object_id *one, struct object_id *two,
 560                unsigned dirty_submodule)
 561{
 562        struct rev_info rev;
 563        struct commit *left = NULL, *right = NULL;
 564        struct commit_list *merge_bases = NULL;
 565
 566        show_submodule_header(o, path, one, two, dirty_submodule,
 567                              &left, &right, &merge_bases);
 568
 569        /*
 570         * If we don't have both a left and a right pointer, there is no
 571         * reason to try and display a summary. The header line should contain
 572         * all the information the user needs.
 573         */
 574        if (!left || !right)
 575                goto out;
 576
 577        /* Treat revision walker failure the same as missing commits */
 578        if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
 579                diff_emit_submodule_error(o, "(revision walker failed)\n");
 580                goto out;
 581        }
 582
 583        print_submodule_summary(&rev, o);
 584
 585out:
 586        if (merge_bases)
 587                free_commit_list(merge_bases);
 588        clear_commit_marks(left, ~0);
 589        clear_commit_marks(right, ~0);
 590}
 591
 592void show_submodule_inline_diff(struct diff_options *o, const char *path,
 593                struct object_id *one, struct object_id *two,
 594                unsigned dirty_submodule)
 595{
 596        const struct object_id *old_oid = the_hash_algo->empty_tree, *new_oid = the_hash_algo->empty_tree;
 597        struct commit *left = NULL, *right = NULL;
 598        struct commit_list *merge_bases = NULL;
 599        struct child_process cp = CHILD_PROCESS_INIT;
 600        struct strbuf sb = STRBUF_INIT;
 601
 602        show_submodule_header(o, path, one, two, dirty_submodule,
 603                              &left, &right, &merge_bases);
 604
 605        /* We need a valid left and right commit to display a difference */
 606        if (!(left || is_null_oid(one)) ||
 607            !(right || is_null_oid(two)))
 608                goto done;
 609
 610        if (left)
 611                old_oid = one;
 612        if (right)
 613                new_oid = two;
 614
 615        cp.git_cmd = 1;
 616        cp.dir = path;
 617        cp.out = -1;
 618        cp.no_stdin = 1;
 619
 620        /* TODO: other options may need to be passed here. */
 621        argv_array_pushl(&cp.args, "diff", "--submodule=diff", NULL);
 622        argv_array_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
 623                         "always" : "never");
 624
 625        if (o->flags.reverse_diff) {
 626                argv_array_pushf(&cp.args, "--src-prefix=%s%s/",
 627                                 o->b_prefix, path);
 628                argv_array_pushf(&cp.args, "--dst-prefix=%s%s/",
 629                                 o->a_prefix, path);
 630        } else {
 631                argv_array_pushf(&cp.args, "--src-prefix=%s%s/",
 632                                 o->a_prefix, path);
 633                argv_array_pushf(&cp.args, "--dst-prefix=%s%s/",
 634                                 o->b_prefix, path);
 635        }
 636        argv_array_push(&cp.args, oid_to_hex(old_oid));
 637        /*
 638         * If the submodule has modified content, we will diff against the
 639         * work tree, under the assumption that the user has asked for the
 640         * diff format and wishes to actually see all differences even if they
 641         * haven't yet been committed to the submodule yet.
 642         */
 643        if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
 644                argv_array_push(&cp.args, oid_to_hex(new_oid));
 645
 646        prepare_submodule_repo_env(&cp.env_array);
 647        if (start_command(&cp))
 648                diff_emit_submodule_error(o, "(diff failed)\n");
 649
 650        while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
 651                diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
 652
 653        if (finish_command(&cp))
 654                diff_emit_submodule_error(o, "(diff failed)\n");
 655
 656done:
 657        strbuf_release(&sb);
 658        if (merge_bases)
 659                free_commit_list(merge_bases);
 660        if (left)
 661                clear_commit_marks(left, ~0);
 662        if (right)
 663                clear_commit_marks(right, ~0);
 664}
 665
 666int should_update_submodules(void)
 667{
 668        return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
 669}
 670
 671const struct submodule *submodule_from_ce(const struct cache_entry *ce)
 672{
 673        if (!S_ISGITLINK(ce->ce_mode))
 674                return NULL;
 675
 676        if (!should_update_submodules())
 677                return NULL;
 678
 679        return submodule_from_path(the_repository, &null_oid, ce->name);
 680}
 681
 682static struct oid_array *submodule_commits(struct string_list *submodules,
 683                                           const char *name)
 684{
 685        struct string_list_item *item;
 686
 687        item = string_list_insert(submodules, name);
 688        if (item->util)
 689                return (struct oid_array *) item->util;
 690
 691        /* NEEDSWORK: should we have oid_array_init()? */
 692        item->util = xcalloc(1, sizeof(struct oid_array));
 693        return (struct oid_array *) item->util;
 694}
 695
 696struct collect_changed_submodules_cb_data {
 697        struct repository *repo;
 698        struct string_list *changed;
 699        const struct object_id *commit_oid;
 700};
 701
 702/*
 703 * this would normally be two functions: default_name_from_path() and
 704 * path_from_default_name(). Since the default name is the same as
 705 * the submodule path we can get away with just one function which only
 706 * checks whether there is a submodule in the working directory at that
 707 * location.
 708 */
 709static const char *default_name_or_path(const char *path_or_name)
 710{
 711        int error_code;
 712
 713        if (!is_submodule_populated_gently(path_or_name, &error_code))
 714                return NULL;
 715
 716        return path_or_name;
 717}
 718
 719static void collect_changed_submodules_cb(struct diff_queue_struct *q,
 720                                          struct diff_options *options,
 721                                          void *data)
 722{
 723        struct collect_changed_submodules_cb_data *me = data;
 724        struct string_list *changed = me->changed;
 725        const struct object_id *commit_oid = me->commit_oid;
 726        int i;
 727
 728        for (i = 0; i < q->nr; i++) {
 729                struct diff_filepair *p = q->queue[i];
 730                struct oid_array *commits;
 731                const struct submodule *submodule;
 732                const char *name;
 733
 734                if (!S_ISGITLINK(p->two->mode))
 735                        continue;
 736
 737                submodule = submodule_from_path(me->repo,
 738                                                commit_oid, p->two->path);
 739                if (submodule)
 740                        name = submodule->name;
 741                else {
 742                        name = default_name_or_path(p->two->path);
 743                        /* make sure name does not collide with existing one */
 744                        if (name)
 745                                submodule = submodule_from_name(me->repo,
 746                                                                commit_oid, name);
 747                        if (submodule) {
 748                                warning("Submodule in commit %s at path: "
 749                                        "'%s' collides with a submodule named "
 750                                        "the same. Skipping it.",
 751                                        oid_to_hex(commit_oid), p->two->path);
 752                                name = NULL;
 753                        }
 754                }
 755
 756                if (!name)
 757                        continue;
 758
 759                commits = submodule_commits(changed, name);
 760                oid_array_append(commits, &p->two->oid);
 761        }
 762}
 763
 764/*
 765 * Collect the paths of submodules in 'changed' which have changed based on
 766 * the revisions as specified in 'argv'.  Each entry in 'changed' will also
 767 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
 768 * what the submodule pointers were updated to during the change.
 769 */
 770static void collect_changed_submodules(struct repository *r,
 771                                       struct string_list *changed,
 772                                       struct argv_array *argv)
 773{
 774        struct rev_info rev;
 775        const struct commit *commit;
 776
 777        repo_init_revisions(r, &rev, NULL);
 778        setup_revisions(argv->argc, argv->argv, &rev, NULL);
 779        if (prepare_revision_walk(&rev))
 780                die("revision walk setup failed");
 781
 782        while ((commit = get_revision(&rev))) {
 783                struct rev_info diff_rev;
 784                struct collect_changed_submodules_cb_data data;
 785                data.repo = r;
 786                data.changed = changed;
 787                data.commit_oid = &commit->object.oid;
 788
 789                repo_init_revisions(r, &diff_rev, NULL);
 790                diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 791                diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
 792                diff_rev.diffopt.format_callback_data = &data;
 793                diff_tree_combined_merge(commit, 1, &diff_rev);
 794        }
 795
 796        reset_revision_walk();
 797}
 798
 799static void free_submodules_oids(struct string_list *submodules)
 800{
 801        struct string_list_item *item;
 802        for_each_string_list_item(item, submodules)
 803                oid_array_clear((struct oid_array *) item->util);
 804        string_list_clear(submodules, 1);
 805}
 806
 807static int has_remote(const char *refname, const struct object_id *oid,
 808                      int flags, void *cb_data)
 809{
 810        return 1;
 811}
 812
 813static int append_oid_to_argv(const struct object_id *oid, void *data)
 814{
 815        struct argv_array *argv = data;
 816        argv_array_push(argv, oid_to_hex(oid));
 817        return 0;
 818}
 819
 820struct has_commit_data {
 821        struct repository *repo;
 822        int result;
 823        const char *path;
 824};
 825
 826static int check_has_commit(const struct object_id *oid, void *data)
 827{
 828        struct has_commit_data *cb = data;
 829
 830        enum object_type type = oid_object_info(cb->repo, oid, NULL);
 831
 832        switch (type) {
 833        case OBJ_COMMIT:
 834                return 0;
 835        case OBJ_BAD:
 836                /*
 837                 * Object is missing or invalid. If invalid, an error message
 838                 * has already been printed.
 839                 */
 840                cb->result = 0;
 841                return 0;
 842        default:
 843                die(_("submodule entry '%s' (%s) is a %s, not a commit"),
 844                    cb->path, oid_to_hex(oid), type_name(type));
 845        }
 846}
 847
 848static int submodule_has_commits(struct repository *r,
 849                                 const char *path,
 850                                 struct oid_array *commits)
 851{
 852        struct has_commit_data has_commit = { r, 1, path };
 853
 854        /*
 855         * Perform a cheap, but incorrect check for the existence of 'commits'.
 856         * This is done by adding the submodule's object store to the in-core
 857         * object store, and then querying for each commit's existence.  If we
 858         * do not have the commit object anywhere, there is no chance we have
 859         * it in the object store of the correct submodule and have it
 860         * reachable from a ref, so we can fail early without spawning rev-list
 861         * which is expensive.
 862         */
 863        if (add_submodule_odb(path))
 864                return 0;
 865
 866        oid_array_for_each_unique(commits, check_has_commit, &has_commit);
 867
 868        if (has_commit.result) {
 869                /*
 870                 * Even if the submodule is checked out and the commit is
 871                 * present, make sure it exists in the submodule's object store
 872                 * and that it is reachable from a ref.
 873                 */
 874                struct child_process cp = CHILD_PROCESS_INIT;
 875                struct strbuf out = STRBUF_INIT;
 876
 877                argv_array_pushl(&cp.args, "rev-list", "-n", "1", NULL);
 878                oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
 879                argv_array_pushl(&cp.args, "--not", "--all", NULL);
 880
 881                prepare_submodule_repo_env(&cp.env_array);
 882                cp.git_cmd = 1;
 883                cp.no_stdin = 1;
 884                cp.dir = path;
 885
 886                if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
 887                        has_commit.result = 0;
 888
 889                strbuf_release(&out);
 890        }
 891
 892        return has_commit.result;
 893}
 894
 895static int submodule_needs_pushing(struct repository *r,
 896                                   const char *path,
 897                                   struct oid_array *commits)
 898{
 899        if (!submodule_has_commits(r, path, commits))
 900                /*
 901                 * NOTE: We do consider it safe to return "no" here. The
 902                 * correct answer would be "We do not know" instead of
 903                 * "No push needed", but it is quite hard to change
 904                 * the submodule pointer without having the submodule
 905                 * around. If a user did however change the submodules
 906                 * without having the submodule around, this indicates
 907                 * an expert who knows what they are doing or a
 908                 * maintainer integrating work from other people. In
 909                 * both cases it should be safe to skip this check.
 910                 */
 911                return 0;
 912
 913        if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
 914                struct child_process cp = CHILD_PROCESS_INIT;
 915                struct strbuf buf = STRBUF_INIT;
 916                int needs_pushing = 0;
 917
 918                argv_array_push(&cp.args, "rev-list");
 919                oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
 920                argv_array_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
 921
 922                prepare_submodule_repo_env(&cp.env_array);
 923                cp.git_cmd = 1;
 924                cp.no_stdin = 1;
 925                cp.out = -1;
 926                cp.dir = path;
 927                if (start_command(&cp))
 928                        die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
 929                                        path);
 930                if (strbuf_read(&buf, cp.out, 41))
 931                        needs_pushing = 1;
 932                finish_command(&cp);
 933                close(cp.out);
 934                strbuf_release(&buf);
 935                return needs_pushing;
 936        }
 937
 938        return 0;
 939}
 940
 941int find_unpushed_submodules(struct repository *r,
 942                             struct oid_array *commits,
 943                             const char *remotes_name,
 944                             struct string_list *needs_pushing)
 945{
 946        struct string_list submodules = STRING_LIST_INIT_DUP;
 947        struct string_list_item *name;
 948        struct argv_array argv = ARGV_ARRAY_INIT;
 949
 950        /* argv.argv[0] will be ignored by setup_revisions */
 951        argv_array_push(&argv, "find_unpushed_submodules");
 952        oid_array_for_each_unique(commits, append_oid_to_argv, &argv);
 953        argv_array_push(&argv, "--not");
 954        argv_array_pushf(&argv, "--remotes=%s", remotes_name);
 955
 956        collect_changed_submodules(r, &submodules, &argv);
 957
 958        for_each_string_list_item(name, &submodules) {
 959                struct oid_array *commits = name->util;
 960                const struct submodule *submodule;
 961                const char *path = NULL;
 962
 963                submodule = submodule_from_name(r, &null_oid, name->string);
 964                if (submodule)
 965                        path = submodule->path;
 966                else
 967                        path = default_name_or_path(name->string);
 968
 969                if (!path)
 970                        continue;
 971
 972                if (submodule_needs_pushing(r, path, commits))
 973                        string_list_insert(needs_pushing, path);
 974        }
 975
 976        free_submodules_oids(&submodules);
 977        argv_array_clear(&argv);
 978
 979        return needs_pushing->nr;
 980}
 981
 982static int push_submodule(const char *path,
 983                          const struct remote *remote,
 984                          const struct refspec *rs,
 985                          const struct string_list *push_options,
 986                          int dry_run)
 987{
 988        if (add_submodule_odb(path))
 989                return 1;
 990
 991        if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
 992                struct child_process cp = CHILD_PROCESS_INIT;
 993                argv_array_push(&cp.args, "push");
 994                if (dry_run)
 995                        argv_array_push(&cp.args, "--dry-run");
 996
 997                if (push_options && push_options->nr) {
 998                        const struct string_list_item *item;
 999                        for_each_string_list_item(item, push_options)
1000                                argv_array_pushf(&cp.args, "--push-option=%s",
1001                                                 item->string);
1002                }
1003
1004                if (remote->origin != REMOTE_UNCONFIGURED) {
1005                        int i;
1006                        argv_array_push(&cp.args, remote->name);
1007                        for (i = 0; i < rs->raw_nr; i++)
1008                                argv_array_push(&cp.args, rs->raw[i]);
1009                }
1010
1011                prepare_submodule_repo_env(&cp.env_array);
1012                cp.git_cmd = 1;
1013                cp.no_stdin = 1;
1014                cp.dir = path;
1015                if (run_command(&cp))
1016                        return 0;
1017                close(cp.out);
1018        }
1019
1020        return 1;
1021}
1022
1023/*
1024 * Perform a check in the submodule to see if the remote and refspec work.
1025 * Die if the submodule can't be pushed.
1026 */
1027static void submodule_push_check(const char *path, const char *head,
1028                                 const struct remote *remote,
1029                                 const struct refspec *rs)
1030{
1031        struct child_process cp = CHILD_PROCESS_INIT;
1032        int i;
1033
1034        argv_array_push(&cp.args, "submodule--helper");
1035        argv_array_push(&cp.args, "push-check");
1036        argv_array_push(&cp.args, head);
1037        argv_array_push(&cp.args, remote->name);
1038
1039        for (i = 0; i < rs->raw_nr; i++)
1040                argv_array_push(&cp.args, rs->raw[i]);
1041
1042        prepare_submodule_repo_env(&cp.env_array);
1043        cp.git_cmd = 1;
1044        cp.no_stdin = 1;
1045        cp.no_stdout = 1;
1046        cp.dir = path;
1047
1048        /*
1049         * Simply indicate if 'submodule--helper push-check' failed.
1050         * More detailed error information will be provided by the
1051         * child process.
1052         */
1053        if (run_command(&cp))
1054                die("process for submodule '%s' failed", path);
1055}
1056
1057int push_unpushed_submodules(struct repository *r,
1058                             struct oid_array *commits,
1059                             const struct remote *remote,
1060                             const struct refspec *rs,
1061                             const struct string_list *push_options,
1062                             int dry_run)
1063{
1064        int i, ret = 1;
1065        struct string_list needs_pushing = STRING_LIST_INIT_DUP;
1066
1067        if (!find_unpushed_submodules(r, commits,
1068                                      remote->name, &needs_pushing))
1069                return 1;
1070
1071        /*
1072         * Verify that the remote and refspec can be propagated to all
1073         * submodules.  This check can be skipped if the remote and refspec
1074         * won't be propagated due to the remote being unconfigured (e.g. a URL
1075         * instead of a remote name).
1076         */
1077        if (remote->origin != REMOTE_UNCONFIGURED) {
1078                char *head;
1079                struct object_id head_oid;
1080
1081                head = resolve_refdup("HEAD", 0, &head_oid, NULL);
1082                if (!head)
1083                        die(_("Failed to resolve HEAD as a valid ref."));
1084
1085                for (i = 0; i < needs_pushing.nr; i++)
1086                        submodule_push_check(needs_pushing.items[i].string,
1087                                             head, remote, rs);
1088                free(head);
1089        }
1090
1091        /* Actually push the submodules */
1092        for (i = 0; i < needs_pushing.nr; i++) {
1093                const char *path = needs_pushing.items[i].string;
1094                fprintf(stderr, "Pushing submodule '%s'\n", path);
1095                if (!push_submodule(path, remote, rs,
1096                                    push_options, dry_run)) {
1097                        fprintf(stderr, "Unable to push submodule '%s'\n", path);
1098                        ret = 0;
1099                }
1100        }
1101
1102        string_list_clear(&needs_pushing, 0);
1103
1104        return ret;
1105}
1106
1107static int append_oid_to_array(const char *ref, const struct object_id *oid,
1108                               int flags, void *data)
1109{
1110        struct oid_array *array = data;
1111        oid_array_append(array, oid);
1112        return 0;
1113}
1114
1115void check_for_new_submodule_commits(struct object_id *oid)
1116{
1117        if (!initialized_fetch_ref_tips) {
1118                for_each_ref(append_oid_to_array, &ref_tips_before_fetch);
1119                initialized_fetch_ref_tips = 1;
1120        }
1121
1122        oid_array_append(&ref_tips_after_fetch, oid);
1123}
1124
1125static void calculate_changed_submodule_paths(struct repository *r)
1126{
1127        struct argv_array argv = ARGV_ARRAY_INIT;
1128        struct string_list changed_submodules = STRING_LIST_INIT_DUP;
1129        const struct string_list_item *name;
1130
1131        /* No need to check if there are no submodules configured */
1132        if (!submodule_from_path(r, NULL, NULL))
1133                return;
1134
1135        argv_array_push(&argv, "--"); /* argv[0] program name */
1136        oid_array_for_each_unique(&ref_tips_after_fetch,
1137                                   append_oid_to_argv, &argv);
1138        argv_array_push(&argv, "--not");
1139        oid_array_for_each_unique(&ref_tips_before_fetch,
1140                                   append_oid_to_argv, &argv);
1141
1142        /*
1143         * Collect all submodules (whether checked out or not) for which new
1144         * commits have been recorded upstream in "changed_submodule_names".
1145         */
1146        collect_changed_submodules(r, &changed_submodules, &argv);
1147
1148        for_each_string_list_item(name, &changed_submodules) {
1149                struct oid_array *commits = name->util;
1150                const struct submodule *submodule;
1151                const char *path = NULL;
1152
1153                submodule = submodule_from_name(r, &null_oid, name->string);
1154                if (submodule)
1155                        path = submodule->path;
1156                else
1157                        path = default_name_or_path(name->string);
1158
1159                if (!path)
1160                        continue;
1161
1162                if (!submodule_has_commits(r, path, commits))
1163                        string_list_append(&changed_submodule_names, name->string);
1164        }
1165
1166        free_submodules_oids(&changed_submodules);
1167        argv_array_clear(&argv);
1168        oid_array_clear(&ref_tips_before_fetch);
1169        oid_array_clear(&ref_tips_after_fetch);
1170        initialized_fetch_ref_tips = 0;
1171}
1172
1173int submodule_touches_in_range(struct repository *r,
1174                               struct object_id *excl_oid,
1175                               struct object_id *incl_oid)
1176{
1177        struct string_list subs = STRING_LIST_INIT_DUP;
1178        struct argv_array args = ARGV_ARRAY_INIT;
1179        int ret;
1180
1181        /* No need to check if there are no submodules configured */
1182        if (!submodule_from_path(r, NULL, NULL))
1183                return 0;
1184
1185        argv_array_push(&args, "--"); /* args[0] program name */
1186        argv_array_push(&args, oid_to_hex(incl_oid));
1187        if (!is_null_oid(excl_oid)) {
1188                argv_array_push(&args, "--not");
1189                argv_array_push(&args, oid_to_hex(excl_oid));
1190        }
1191
1192        collect_changed_submodules(r, &subs, &args);
1193        ret = subs.nr;
1194
1195        argv_array_clear(&args);
1196
1197        free_submodules_oids(&subs);
1198        return ret;
1199}
1200
1201struct submodule_parallel_fetch {
1202        int count;
1203        struct argv_array args;
1204        struct repository *r;
1205        const char *prefix;
1206        int command_line_option;
1207        int default_option;
1208        int quiet;
1209        int result;
1210};
1211#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0}
1212
1213static int get_fetch_recurse_config(const struct submodule *submodule,
1214                                    struct submodule_parallel_fetch *spf)
1215{
1216        if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT)
1217                return spf->command_line_option;
1218
1219        if (submodule) {
1220                char *key;
1221                const char *value;
1222
1223                int fetch_recurse = submodule->fetch_recurse;
1224                key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
1225                if (!repo_config_get_string_const(spf->r, key, &value)) {
1226                        fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
1227                }
1228                free(key);
1229
1230                if (fetch_recurse != RECURSE_SUBMODULES_NONE)
1231                        /* local config overrules everything except commandline */
1232                        return fetch_recurse;
1233        }
1234
1235        return spf->default_option;
1236}
1237
1238static int get_next_submodule(struct child_process *cp,
1239                              struct strbuf *err, void *data, void **task_cb)
1240{
1241        int ret = 0;
1242        struct submodule_parallel_fetch *spf = data;
1243
1244        for (; spf->count < spf->r->index->cache_nr; spf->count++) {
1245                struct strbuf submodule_path = STRBUF_INIT;
1246                struct strbuf submodule_git_dir = STRBUF_INIT;
1247                struct strbuf submodule_prefix = STRBUF_INIT;
1248                const struct cache_entry *ce = spf->r->index->cache[spf->count];
1249                const char *git_dir, *default_argv;
1250                const struct submodule *submodule;
1251                struct submodule default_submodule = SUBMODULE_INIT;
1252
1253                if (!S_ISGITLINK(ce->ce_mode))
1254                        continue;
1255
1256                submodule = submodule_from_path(spf->r, &null_oid, ce->name);
1257                if (!submodule) {
1258                        const char *name = default_name_or_path(ce->name);
1259                        if (name) {
1260                                default_submodule.path = default_submodule.name = name;
1261                                submodule = &default_submodule;
1262                        }
1263                }
1264
1265                switch (get_fetch_recurse_config(submodule, spf))
1266                {
1267                default:
1268                case RECURSE_SUBMODULES_DEFAULT:
1269                case RECURSE_SUBMODULES_ON_DEMAND:
1270                        if (!submodule || !unsorted_string_list_lookup(&changed_submodule_names,
1271                                                         submodule->name))
1272                                continue;
1273                        default_argv = "on-demand";
1274                        break;
1275                case RECURSE_SUBMODULES_ON:
1276                        default_argv = "yes";
1277                        break;
1278                case RECURSE_SUBMODULES_OFF:
1279                        continue;
1280                }
1281
1282                strbuf_repo_worktree_path(&submodule_path, spf->r, "%s", ce->name);
1283                strbuf_addf(&submodule_git_dir, "%s/.git", submodule_path.buf);
1284                strbuf_addf(&submodule_prefix, "%s%s/", spf->prefix, ce->name);
1285                git_dir = read_gitfile(submodule_git_dir.buf);
1286                if (!git_dir)
1287                        git_dir = submodule_git_dir.buf;
1288                if (is_directory(git_dir)) {
1289                        child_process_init(cp);
1290                        cp->dir = strbuf_detach(&submodule_path, NULL);
1291                        prepare_submodule_repo_env(&cp->env_array);
1292                        cp->git_cmd = 1;
1293                        if (!spf->quiet)
1294                                strbuf_addf(err, "Fetching submodule %s%s\n",
1295                                            spf->prefix, ce->name);
1296                        argv_array_init(&cp->args);
1297                        argv_array_pushv(&cp->args, spf->args.argv);
1298                        argv_array_push(&cp->args, default_argv);
1299                        argv_array_push(&cp->args, "--submodule-prefix");
1300                        argv_array_push(&cp->args, submodule_prefix.buf);
1301                        ret = 1;
1302                }
1303                strbuf_release(&submodule_path);
1304                strbuf_release(&submodule_git_dir);
1305                strbuf_release(&submodule_prefix);
1306                if (ret) {
1307                        spf->count++;
1308                        return 1;
1309                }
1310        }
1311        return 0;
1312}
1313
1314static int fetch_start_failure(struct strbuf *err,
1315                               void *cb, void *task_cb)
1316{
1317        struct submodule_parallel_fetch *spf = cb;
1318
1319        spf->result = 1;
1320
1321        return 0;
1322}
1323
1324static int fetch_finish(int retvalue, struct strbuf *err,
1325                        void *cb, void *task_cb)
1326{
1327        struct submodule_parallel_fetch *spf = cb;
1328
1329        if (retvalue)
1330                spf->result = 1;
1331
1332        return 0;
1333}
1334
1335int fetch_populated_submodules(struct repository *r,
1336                               const struct argv_array *options,
1337                               const char *prefix, int command_line_option,
1338                               int default_option,
1339                               int quiet, int max_parallel_jobs)
1340{
1341        int i;
1342        struct submodule_parallel_fetch spf = SPF_INIT;
1343
1344        spf.r = r;
1345        spf.command_line_option = command_line_option;
1346        spf.default_option = default_option;
1347        spf.quiet = quiet;
1348        spf.prefix = prefix;
1349
1350        if (!r->worktree)
1351                goto out;
1352
1353        if (repo_read_index(r) < 0)
1354                die("index file corrupt");
1355
1356        argv_array_push(&spf.args, "fetch");
1357        for (i = 0; i < options->argc; i++)
1358                argv_array_push(&spf.args, options->argv[i]);
1359        argv_array_push(&spf.args, "--recurse-submodules-default");
1360        /* default value, "--submodule-prefix" and its value are added later */
1361
1362        calculate_changed_submodule_paths(r);
1363        run_processes_parallel(max_parallel_jobs,
1364                               get_next_submodule,
1365                               fetch_start_failure,
1366                               fetch_finish,
1367                               &spf);
1368
1369        argv_array_clear(&spf.args);
1370out:
1371        string_list_clear(&changed_submodule_names, 1);
1372        return spf.result;
1373}
1374
1375unsigned is_submodule_modified(const char *path, int ignore_untracked)
1376{
1377        struct child_process cp = CHILD_PROCESS_INIT;
1378        struct strbuf buf = STRBUF_INIT;
1379        FILE *fp;
1380        unsigned dirty_submodule = 0;
1381        const char *git_dir;
1382        int ignore_cp_exit_code = 0;
1383
1384        strbuf_addf(&buf, "%s/.git", path);
1385        git_dir = read_gitfile(buf.buf);
1386        if (!git_dir)
1387                git_dir = buf.buf;
1388        if (!is_git_directory(git_dir)) {
1389                if (is_directory(git_dir))
1390                        die(_("'%s' not recognized as a git repository"), git_dir);
1391                strbuf_release(&buf);
1392                /* The submodule is not checked out, so it is not modified */
1393                return 0;
1394        }
1395        strbuf_reset(&buf);
1396
1397        argv_array_pushl(&cp.args, "status", "--porcelain=2", NULL);
1398        if (ignore_untracked)
1399                argv_array_push(&cp.args, "-uno");
1400
1401        prepare_submodule_repo_env(&cp.env_array);
1402        cp.git_cmd = 1;
1403        cp.no_stdin = 1;
1404        cp.out = -1;
1405        cp.dir = path;
1406        if (start_command(&cp))
1407                die("Could not run 'git status --porcelain=2' in submodule %s", path);
1408
1409        fp = xfdopen(cp.out, "r");
1410        while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
1411                /* regular untracked files */
1412                if (buf.buf[0] == '?')
1413                        dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1414
1415                if (buf.buf[0] == 'u' ||
1416                    buf.buf[0] == '1' ||
1417                    buf.buf[0] == '2') {
1418                        /* T = line type, XY = status, SSSS = submodule state */
1419                        if (buf.len < strlen("T XY SSSS"))
1420                                BUG("invalid status --porcelain=2 line %s",
1421                                    buf.buf);
1422
1423                        if (buf.buf[5] == 'S' && buf.buf[8] == 'U')
1424                                /* nested untracked file */
1425                                dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1426
1427                        if (buf.buf[0] == 'u' ||
1428                            buf.buf[0] == '2' ||
1429                            memcmp(buf.buf + 5, "S..U", 4))
1430                                /* other change */
1431                                dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
1432                }
1433
1434                if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
1435                    ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
1436                     ignore_untracked)) {
1437                        /*
1438                         * We're not interested in any further information from
1439                         * the child any more, neither output nor its exit code.
1440                         */
1441                        ignore_cp_exit_code = 1;
1442                        break;
1443                }
1444        }
1445        fclose(fp);
1446
1447        if (finish_command(&cp) && !ignore_cp_exit_code)
1448                die("'git status --porcelain=2' failed in submodule %s", path);
1449
1450        strbuf_release(&buf);
1451        return dirty_submodule;
1452}
1453
1454int submodule_uses_gitfile(const char *path)
1455{
1456        struct child_process cp = CHILD_PROCESS_INIT;
1457        const char *argv[] = {
1458                "submodule",
1459                "foreach",
1460                "--quiet",
1461                "--recursive",
1462                "test -f .git",
1463                NULL,
1464        };
1465        struct strbuf buf = STRBUF_INIT;
1466        const char *git_dir;
1467
1468        strbuf_addf(&buf, "%s/.git", path);
1469        git_dir = read_gitfile(buf.buf);
1470        if (!git_dir) {
1471                strbuf_release(&buf);
1472                return 0;
1473        }
1474        strbuf_release(&buf);
1475
1476        /* Now test that all nested submodules use a gitfile too */
1477        cp.argv = argv;
1478        prepare_submodule_repo_env(&cp.env_array);
1479        cp.git_cmd = 1;
1480        cp.no_stdin = 1;
1481        cp.no_stderr = 1;
1482        cp.no_stdout = 1;
1483        cp.dir = path;
1484        if (run_command(&cp))
1485                return 0;
1486
1487        return 1;
1488}
1489
1490/*
1491 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1492 * when doing so.
1493 *
1494 * Return 1 if we'd lose data, return 0 if the removal is fine,
1495 * and negative values for errors.
1496 */
1497int bad_to_remove_submodule(const char *path, unsigned flags)
1498{
1499        ssize_t len;
1500        struct child_process cp = CHILD_PROCESS_INIT;
1501        struct strbuf buf = STRBUF_INIT;
1502        int ret = 0;
1503
1504        if (!file_exists(path) || is_empty_dir(path))
1505                return 0;
1506
1507        if (!submodule_uses_gitfile(path))
1508                return 1;
1509
1510        argv_array_pushl(&cp.args, "status", "--porcelain",
1511                                   "--ignore-submodules=none", NULL);
1512
1513        if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED)
1514                argv_array_push(&cp.args, "-uno");
1515        else
1516                argv_array_push(&cp.args, "-uall");
1517
1518        if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
1519                argv_array_push(&cp.args, "--ignored");
1520
1521        prepare_submodule_repo_env(&cp.env_array);
1522        cp.git_cmd = 1;
1523        cp.no_stdin = 1;
1524        cp.out = -1;
1525        cp.dir = path;
1526        if (start_command(&cp)) {
1527                if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
1528                        die(_("could not start 'git status' in submodule '%s'"),
1529                                path);
1530                ret = -1;
1531                goto out;
1532        }
1533
1534        len = strbuf_read(&buf, cp.out, 1024);
1535        if (len > 2)
1536                ret = 1;
1537        close(cp.out);
1538
1539        if (finish_command(&cp)) {
1540                if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
1541                        die(_("could not run 'git status' in submodule '%s'"),
1542                                path);
1543                ret = -1;
1544        }
1545out:
1546        strbuf_release(&buf);
1547        return ret;
1548}
1549
1550static const char *get_super_prefix_or_empty(void)
1551{
1552        const char *s = get_super_prefix();
1553        if (!s)
1554                s = "";
1555        return s;
1556}
1557
1558static int submodule_has_dirty_index(const struct submodule *sub)
1559{
1560        struct child_process cp = CHILD_PROCESS_INIT;
1561
1562        prepare_submodule_repo_env(&cp.env_array);
1563
1564        cp.git_cmd = 1;
1565        argv_array_pushl(&cp.args, "diff-index", "--quiet",
1566                                   "--cached", "HEAD", NULL);
1567        cp.no_stdin = 1;
1568        cp.no_stdout = 1;
1569        cp.dir = sub->path;
1570        if (start_command(&cp))
1571                die("could not recurse into submodule '%s'", sub->path);
1572
1573        return finish_command(&cp);
1574}
1575
1576static void submodule_reset_index(const char *path)
1577{
1578        struct child_process cp = CHILD_PROCESS_INIT;
1579        prepare_submodule_repo_env(&cp.env_array);
1580
1581        cp.git_cmd = 1;
1582        cp.no_stdin = 1;
1583        cp.dir = path;
1584
1585        argv_array_pushf(&cp.args, "--super-prefix=%s%s/",
1586                                   get_super_prefix_or_empty(), path);
1587        argv_array_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
1588
1589        argv_array_push(&cp.args, empty_tree_oid_hex());
1590
1591        if (run_command(&cp))
1592                die("could not reset submodule index");
1593}
1594
1595/**
1596 * Moves a submodule at a given path from a given head to another new head.
1597 * For edge cases (a submodule coming into existence or removing a submodule)
1598 * pass NULL for old or new respectively.
1599 */
1600int submodule_move_head(const char *path,
1601                         const char *old_head,
1602                         const char *new_head,
1603                         unsigned flags)
1604{
1605        int ret = 0;
1606        struct child_process cp = CHILD_PROCESS_INIT;
1607        const struct submodule *sub;
1608        int *error_code_ptr, error_code;
1609
1610        if (!is_submodule_active(the_repository, path))
1611                return 0;
1612
1613        if (flags & SUBMODULE_MOVE_HEAD_FORCE)
1614                /*
1615                 * Pass non NULL pointer to is_submodule_populated_gently
1616                 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
1617                 * to fixup the submodule in the force case later.
1618                 */
1619                error_code_ptr = &error_code;
1620        else
1621                error_code_ptr = NULL;
1622
1623        if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
1624                return 0;
1625
1626        sub = submodule_from_path(the_repository, &null_oid, path);
1627
1628        if (!sub)
1629                BUG("could not get submodule information for '%s'", path);
1630
1631        if (old_head && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
1632                /* Check if the submodule has a dirty index. */
1633                if (submodule_has_dirty_index(sub))
1634                        return error(_("submodule '%s' has dirty index"), path);
1635        }
1636
1637        if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
1638                if (old_head) {
1639                        if (!submodule_uses_gitfile(path))
1640                                absorb_git_dir_into_superproject("", path,
1641                                        ABSORB_GITDIR_RECURSE_SUBMODULES);
1642                } else {
1643                        char *gitdir = xstrfmt("%s/modules/%s",
1644                                    get_git_common_dir(), sub->name);
1645                        connect_work_tree_and_git_dir(path, gitdir, 0);
1646                        free(gitdir);
1647
1648                        /* make sure the index is clean as well */
1649                        submodule_reset_index(path);
1650                }
1651
1652                if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
1653                        char *gitdir = xstrfmt("%s/modules/%s",
1654                                    get_git_common_dir(), sub->name);
1655                        connect_work_tree_and_git_dir(path, gitdir, 1);
1656                        free(gitdir);
1657                }
1658        }
1659
1660        prepare_submodule_repo_env(&cp.env_array);
1661
1662        cp.git_cmd = 1;
1663        cp.no_stdin = 1;
1664        cp.dir = path;
1665
1666        argv_array_pushf(&cp.args, "--super-prefix=%s%s/",
1667                        get_super_prefix_or_empty(), path);
1668        argv_array_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL);
1669
1670        if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN)
1671                argv_array_push(&cp.args, "-n");
1672        else
1673                argv_array_push(&cp.args, "-u");
1674
1675        if (flags & SUBMODULE_MOVE_HEAD_FORCE)
1676                argv_array_push(&cp.args, "--reset");
1677        else
1678                argv_array_push(&cp.args, "-m");
1679
1680        if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
1681                argv_array_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
1682
1683        argv_array_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
1684
1685        if (run_command(&cp)) {
1686                ret = error(_("Submodule '%s' could not be updated."), path);
1687                goto out;
1688        }
1689
1690        if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
1691                if (new_head) {
1692                        child_process_init(&cp);
1693                        /* also set the HEAD accordingly */
1694                        cp.git_cmd = 1;
1695                        cp.no_stdin = 1;
1696                        cp.dir = path;
1697
1698                        prepare_submodule_repo_env(&cp.env_array);
1699                        argv_array_pushl(&cp.args, "update-ref", "HEAD",
1700                                         "--no-deref", new_head, NULL);
1701
1702                        if (run_command(&cp)) {
1703                                ret = -1;
1704                                goto out;
1705                        }
1706                } else {
1707                        struct strbuf sb = STRBUF_INIT;
1708
1709                        strbuf_addf(&sb, "%s/.git", path);
1710                        unlink_or_warn(sb.buf);
1711                        strbuf_release(&sb);
1712
1713                        if (is_empty_dir(path))
1714                                rmdir_or_warn(path);
1715                }
1716        }
1717out:
1718        return ret;
1719}
1720
1721/*
1722 * Embeds a single submodules git directory into the superprojects git dir,
1723 * non recursively.
1724 */
1725static void relocate_single_git_dir_into_superproject(const char *prefix,
1726                                                      const char *path)
1727{
1728        char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
1729        const char *new_git_dir;
1730        const struct submodule *sub;
1731
1732        if (submodule_uses_worktrees(path))
1733                die(_("relocate_gitdir for submodule '%s' with "
1734                      "more than one worktree not supported"), path);
1735
1736        old_git_dir = xstrfmt("%s/.git", path);
1737        if (read_gitfile(old_git_dir))
1738                /* If it is an actual gitfile, it doesn't need migration. */
1739                return;
1740
1741        real_old_git_dir = real_pathdup(old_git_dir, 1);
1742
1743        sub = submodule_from_path(the_repository, &null_oid, path);
1744        if (!sub)
1745                die(_("could not lookup name for submodule '%s'"), path);
1746
1747        new_git_dir = git_path("modules/%s", sub->name);
1748        if (safe_create_leading_directories_const(new_git_dir) < 0)
1749                die(_("could not create directory '%s'"), new_git_dir);
1750        real_new_git_dir = real_pathdup(new_git_dir, 1);
1751
1752        fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
1753                get_super_prefix_or_empty(), path,
1754                real_old_git_dir, real_new_git_dir);
1755
1756        relocate_gitdir(path, real_old_git_dir, real_new_git_dir);
1757
1758        free(old_git_dir);
1759        free(real_old_git_dir);
1760        free(real_new_git_dir);
1761}
1762
1763/*
1764 * Migrate the git directory of the submodule given by path from
1765 * having its git directory within the working tree to the git dir nested
1766 * in its superprojects git dir under modules/.
1767 */
1768void absorb_git_dir_into_superproject(const char *prefix,
1769                                      const char *path,
1770                                      unsigned flags)
1771{
1772        int err_code;
1773        const char *sub_git_dir;
1774        struct strbuf gitdir = STRBUF_INIT;
1775        strbuf_addf(&gitdir, "%s/.git", path);
1776        sub_git_dir = resolve_gitdir_gently(gitdir.buf, &err_code);
1777
1778        /* Not populated? */
1779        if (!sub_git_dir) {
1780                const struct submodule *sub;
1781
1782                if (err_code == READ_GITFILE_ERR_STAT_FAILED) {
1783                        /* unpopulated as expected */
1784                        strbuf_release(&gitdir);
1785                        return;
1786                }
1787
1788                if (err_code != READ_GITFILE_ERR_NOT_A_REPO)
1789                        /* We don't know what broke here. */
1790                        read_gitfile_error_die(err_code, path, NULL);
1791
1792                /*
1793                * Maybe populated, but no git directory was found?
1794                * This can happen if the superproject is a submodule
1795                * itself and was just absorbed. The absorption of the
1796                * superproject did not rewrite the git file links yet,
1797                * fix it now.
1798                */
1799                sub = submodule_from_path(the_repository, &null_oid, path);
1800                if (!sub)
1801                        die(_("could not lookup name for submodule '%s'"), path);
1802                connect_work_tree_and_git_dir(path,
1803                        git_path("modules/%s", sub->name), 0);
1804        } else {
1805                /* Is it already absorbed into the superprojects git dir? */
1806                char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
1807                char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);
1808
1809                if (!starts_with(real_sub_git_dir, real_common_git_dir))
1810                        relocate_single_git_dir_into_superproject(prefix, path);
1811
1812                free(real_sub_git_dir);
1813                free(real_common_git_dir);
1814        }
1815        strbuf_release(&gitdir);
1816
1817        if (flags & ABSORB_GITDIR_RECURSE_SUBMODULES) {
1818                struct child_process cp = CHILD_PROCESS_INIT;
1819                struct strbuf sb = STRBUF_INIT;
1820
1821                if (flags & ~ABSORB_GITDIR_RECURSE_SUBMODULES)
1822                        BUG("we don't know how to pass the flags down?");
1823
1824                strbuf_addstr(&sb, get_super_prefix_or_empty());
1825                strbuf_addstr(&sb, path);
1826                strbuf_addch(&sb, '/');
1827
1828                cp.dir = path;
1829                cp.git_cmd = 1;
1830                cp.no_stdin = 1;
1831                argv_array_pushl(&cp.args, "--super-prefix", sb.buf,
1832                                           "submodule--helper",
1833                                           "absorb-git-dirs", NULL);
1834                prepare_submodule_repo_env(&cp.env_array);
1835                if (run_command(&cp))
1836                        die(_("could not recurse into submodule '%s'"), path);
1837
1838                strbuf_release(&sb);
1839        }
1840}
1841
1842const char *get_superproject_working_tree(void)
1843{
1844        struct child_process cp = CHILD_PROCESS_INIT;
1845        struct strbuf sb = STRBUF_INIT;
1846        const char *one_up = real_path_if_valid("../");
1847        const char *cwd = xgetcwd();
1848        const char *ret = NULL;
1849        const char *subpath;
1850        int code;
1851        ssize_t len;
1852
1853        if (!is_inside_work_tree())
1854                /*
1855                 * FIXME:
1856                 * We might have a superproject, but it is harder
1857                 * to determine.
1858                 */
1859                return NULL;
1860
1861        if (!one_up)
1862                return NULL;
1863
1864        subpath = relative_path(cwd, one_up, &sb);
1865
1866        prepare_submodule_repo_env(&cp.env_array);
1867        argv_array_pop(&cp.env_array);
1868
1869        argv_array_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
1870                        "ls-files", "-z", "--stage", "--full-name", "--",
1871                        subpath, NULL);
1872        strbuf_reset(&sb);
1873
1874        cp.no_stdin = 1;
1875        cp.no_stderr = 1;
1876        cp.out = -1;
1877        cp.git_cmd = 1;
1878
1879        if (start_command(&cp))
1880                die(_("could not start ls-files in .."));
1881
1882        len = strbuf_read(&sb, cp.out, PATH_MAX);
1883        close(cp.out);
1884
1885        if (starts_with(sb.buf, "160000")) {
1886                int super_sub_len;
1887                int cwd_len = strlen(cwd);
1888                char *super_sub, *super_wt;
1889
1890                /*
1891                 * There is a superproject having this repo as a submodule.
1892                 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
1893                 * We're only interested in the name after the tab.
1894                 */
1895                super_sub = strchr(sb.buf, '\t') + 1;
1896                super_sub_len = strlen(super_sub);
1897
1898                if (super_sub_len > cwd_len ||
1899                    strcmp(&cwd[cwd_len - super_sub_len], super_sub))
1900                        BUG("returned path string doesn't match cwd?");
1901
1902                super_wt = xstrdup(cwd);
1903                super_wt[cwd_len - super_sub_len] = '\0';
1904
1905                ret = real_path(super_wt);
1906                free(super_wt);
1907        }
1908        strbuf_release(&sb);
1909
1910        code = finish_command(&cp);
1911
1912        if (code == 128)
1913                /* '../' is not a git repository */
1914                return NULL;
1915        if (code == 0 && len == 0)
1916                /* There is an unrelated git repository at '../' */
1917                return NULL;
1918        if (code)
1919                die(_("ls-tree returned unexpected return code %d"), code);
1920
1921        return ret;
1922}
1923
1924/*
1925 * Put the gitdir for a submodule (given relative to the main
1926 * repository worktree) into `buf`, or return -1 on error.
1927 */
1928int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
1929{
1930        const struct submodule *sub;
1931        const char *git_dir;
1932        int ret = 0;
1933
1934        strbuf_reset(buf);
1935        strbuf_addstr(buf, submodule);
1936        strbuf_complete(buf, '/');
1937        strbuf_addstr(buf, ".git");
1938
1939        git_dir = read_gitfile(buf->buf);
1940        if (git_dir) {
1941                strbuf_reset(buf);
1942                strbuf_addstr(buf, git_dir);
1943        }
1944        if (!is_git_directory(buf->buf)) {
1945                sub = submodule_from_path(the_repository, &null_oid, submodule);
1946                if (!sub) {
1947                        ret = -1;
1948                        goto cleanup;
1949                }
1950                strbuf_reset(buf);
1951                strbuf_git_path(buf, "%s/%s", "modules", sub->name);
1952        }
1953
1954cleanup:
1955        return ret;
1956}