git.oblomov.eu Git - git/blob - submodule.c

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