git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 12/17] update submodules: add submodule_move_head

From
BWBrandon Williams <bmwill@google.com>
Date
Mar 9, 2017, 23:43 UTC
Message-ID
<20170309234317.GF52558@google.com>
In-Reply-To
<20170309221543.15897-13-sbeller@google.com>
On 03/09, Stefan Beller wrote:
Show 49 quoted lines
> +/**
> + * Moves a submodule at a given path from a given head to another new head.
> + * For edge cases (a submodule coming into existence or removing a submodule)
> + * pass NULL for old or new respectively.
> + */
> +int submodule_move_head(const char *path,
> +			 const char *old,
> +			 const char *new,
> +			 unsigned flags)
> +{
> +	int ret = 0;
> +	struct child_process cp = CHILD_PROCESS_INIT;
> +	const struct submodule *sub;
> +
> +	sub = submodule_from_path(null_sha1, path);
> +
> +	if (!sub)
> +		die("BUG: could not get submodule information for '%s'", path);
> +
> +	if (old && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
> +		/* Check if the submodule has a dirty index. */
> +		if (submodule_has_dirty_index(sub))
> +			return error(_("submodule '%s' has dirty index"), path);
> +	}
> +
> +	if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
> +		if (old) {
> +			if (!submodule_uses_gitfile(path))
> +				absorb_git_dir_into_superproject("", path,
> +					ABSORB_GITDIR_RECURSE_SUBMODULES);
> +		} else {
> +			struct strbuf sb = STRBUF_INIT;
> +			strbuf_addf(&sb, "%s/modules/%s",
> +				    get_git_common_dir(), sub->name);
> +			connect_work_tree_and_git_dir(path, sb.buf);
> +			strbuf_release(&sb);
> +
> +			/* make sure the index is clean as well */
> +			submodule_reset_index(path);
> +		}
> +	}
> +
> +	prepare_submodule_repo_env_no_git_dir(&cp.env_array);
> +
> +	cp.git_cmd = 1;
> +	cp.no_stdin = 1;
> +	cp.dir = path;
> +
> +	argv_array_pushf(&cp.args, "--super-prefix=%s/", path);
Missed this one too.  Same question as the other spot.
-- 
Brandon Williams
Previous: Stefan BellerNext: Brandon Williams
Message 64 of 100 in “Checkout aware of Submodules!”
  1. 00/18 Checkout aware of Submodules!Stefan Beller, Mar 2, 2017
  2. 09/18 update submodules: add a config option to determine if submodules are updatedStefan Beller, Mar 2, 2017
  3. 02/18 lib-submodule-update.sh: do not use ./. as submodule remoteStefan Beller, Mar 2, 2017
  4. 10/18 submodules: introduce check to see whether to touch a submoduleStefan Beller, Mar 2, 2017
  5. 12/18 update submodules: add submodule_move_headStefan Beller, Mar 2, 2017
  6. 08/18 update submodules: add submodule config parsingStefan Beller, Mar 2, 2017
  7. 04/18 lib-submodule-update.sh: replace sha1 by hashStefan Beller, Mar 2, 2017
  8. 16/18 entry.c: update submodules when interestingStefan Beller, Mar 2, 2017
  9. 06/18 make is_submodule_populated gentlyStefan Beller, Mar 2, 2017
  10. 07/18 connect_work_tree_and_git_dir: safely create leading directoriesStefan Beller, Mar 2, 2017
  11. 17/18 builtin/checkout: add --recurse-submodules switchStefan Beller, Mar 2, 2017
  12. 18/18 builtin/read-tree: add --recurse-submodules switchStefan Beller, Mar 2, 2017
  13. 13/18 unpack-trees: pass old oid to verify_clean_submoduleStefan Beller, Mar 2, 2017
  14. 15/18 read-cache, remove_marked_cache_entries: wipe selected submodules.Stefan Beller, Mar 2, 2017
  15. 11/18 update submodules: move up prepare_submodule_repo_envStefan Beller, Mar 2, 2017
  16. 03/18 lib-submodule-update: teach test_submodule_content the -C <dir> flagStefan Beller, Mar 2, 2017
  17. Eric WongMar 2, 2017
  18. Stefan BellerMar 6, 2017
  19. Stefan BellerMar 6, 2017
  20. 05/18 lib-submodule-update.sh: define tests for recursing into submodulesStefan Beller, Mar 2, 2017
  21. 14/18 unpack-trees: check if we can perform the operation for submodulesStefan Beller, Mar 2, 2017
  22. 01/18 lib-submodule-update.sh: reorder create_lib_submodule_repoStefan Beller, Mar 2, 2017
  23. 00/18 Checkout aware of Submodules!Stefan Beller, Mar 6, 2017
  24. 03/18 lib-submodule-update: teach test_submodule_content the -C <dir> flagStefan Beller, Mar 6, 2017
  25. Junio C HamanoMar 6, 2017
  26. 10/18 submodules: introduce check to see whether to touch a submoduleStefan Beller, Mar 6, 2017
  27. 07/18 connect_work_tree_and_git_dir: safely create leading directoriesStefan Beller, Mar 6, 2017
  28. 02/18 lib-submodule-update.sh: do not use ./. as submodule remoteStefan Beller, Mar 6, 2017
  29. 17/18 builtin/checkout: add --recurse-submodules switchStefan Beller, Mar 6, 2017
  30. 01/18 lib-submodule-update.sh: reorder create_lib_submodule_repoStefan Beller, Mar 6, 2017
  31. 13/18 unpack-trees: pass old oid to verify_clean_submoduleStefan Beller, Mar 6, 2017
  32. 15/18 read-cache, remove_marked_cache_entries: wipe selected submodules.Stefan Beller, Mar 6, 2017
  33. Junio C HamanoMar 7, 2017
  34. Stefan BellerMar 7, 2017
  35. Junio C HamanoMar 8, 2017
  36. Stefan BellerMar 8, 2017
  37. Junio C HamanoMar 8, 2017
  38. 12/18 update submodules: add submodule_move_headStefan Beller, Mar 6, 2017
  39. 16/18 entry.c: update submodules when interestingStefan Beller, Mar 6, 2017
  40. Junio C HamanoMar 7, 2017
  41. Junio C HamanoMar 7, 2017
  42. Stefan BellerMar 7, 2017
  43. Junio C HamanoMar 8, 2017
  44. 11/18 update submodules: move up prepare_submodule_repo_envStefan Beller, Mar 6, 2017
  45. 04/18 lib-submodule-update.sh: replace sha1 by hashStefan Beller, Mar 6, 2017
  46. 14/18 unpack-trees: check if we can perform the operation for submodulesStefan Beller, Mar 6, 2017
  47. 05/18 lib-submodule-update.sh: define tests for recursing into submodulesStefan Beller, Mar 6, 2017
  48. Junio C HamanoMar 7, 2017
  49. 18/18 builtin/read-tree: add --recurse-submodules switchStefan Beller, Mar 6, 2017
  50. Junio C HamanoMar 7, 2017
  51. 08/18 update submodules: add submodule config parsingStefan Beller, Mar 6, 2017
  52. 06/18 make is_submodule_populated gentlyStefan Beller, Mar 6, 2017
  53. 09/18 update submodules: add a config option to determine if submodules are updatedStefan Beller, Mar 6, 2017
  54. 00/17 Checkout aware of Submodules!Stefan Beller, Mar 9, 2017
  55. 01/17 lib-submodule-update.sh: reorder create_lib_submodule_repoStefan Beller, Mar 9, 2017
  56. 08/17 update submodules: add submodule config parsingStefan Beller, Mar 9, 2017
  57. 03/17 lib-submodule-update: teach test_submodule_content the -C <dir> flagStefan Beller, Mar 9, 2017
  58. 10/17 submodules: introduce check to see whether to touch a submoduleStefan Beller, Mar 9, 2017
  59. 12/17 update submodules: add submodule_move_headStefan Beller, Mar 9, 2017
  60. Brandon WilliamsMar 9, 2017
  61. Junio C HamanoMar 12, 2017
  62. Brandon WilliamsMar 13, 2017
  63. Stefan BellerMar 13, 2017
  64. Brandon WilliamsMar 9, 2017
  65. Brandon WilliamsMar 9, 2017
  66. 07/17 connect_work_tree_and_git_dir: safely create leading directoriesStefan Beller, Mar 9, 2017
  67. Brandon WilliamsMar 9, 2017
  68. Junio C HamanoMar 12, 2017
  69. 05/17 lib-submodule-update.sh: define tests for recursing into submodulesStefan Beller, Mar 9, 2017
  70. 16/17 builtin/checkout: add --recurse-submodules switchStefan Beller, Mar 9, 2017
  71. 17/17 builtin/read-tree: add --recurse-submodules switchStefan Beller, Mar 9, 2017
  72. 15/17 entry.c: create submodules when interestingStefan Beller, Mar 9, 2017
  73. 09/17 update submodules: add a config option to determine if submodules are updatedStefan Beller, Mar 9, 2017
  74. 11/17 update submodules: move up prepare_submodule_repo_envStefan Beller, Mar 9, 2017
  75. 13/17 unpack-trees: pass old oid to verify_clean_submoduleStefan Beller, Mar 9, 2017
  76. 04/17 lib-submodule-update.sh: replace sha1 by hashStefan Beller, Mar 9, 2017
  77. 14/17 unpack-trees: check if we can perform the operation for submodulesStefan Beller, Mar 9, 2017
  78. 02/17 lib-submodule-update.sh: do not use ./. as submodule remoteStefan Beller, Mar 9, 2017
  79. 06/17 make is_submodule_populated gentlyStefan Beller, Mar 9, 2017
  80. 00/19 Checkout aware of Submodules!Stefan Beller, Mar 14, 2017
  81. 01/19 connect_work_tree_and_git_dir: safely create leading directoriesStefan Beller, Mar 14, 2017
  82. 02/19 submodule--helper.c: remove duplicate codeStefan Beller, Mar 14, 2017
  83. 04/19 lib-submodule-update.sh: do not use ./. as submodule remoteStefan Beller, Mar 14, 2017
  84. 07/19 lib-submodule-update.sh: define tests for recursing into submodulesStefan Beller, Mar 14, 2017
  85. 05/19 lib-submodule-update: teach test_submodule_content the -C <dir> flagStefan Beller, Mar 14, 2017
  86. 11/19 submodules: introduce check to see whether to touch a submoduleStefan Beller, Mar 14, 2017
  87. 17/19 entry.c: create submodules when interestingStefan Beller, Mar 14, 2017
  88. 14/19 update submodules: add submodule_move_headStefan Beller, Mar 14, 2017
  89. 18/19 builtin/checkout: add --recurse-submodules switchStefan Beller, Mar 14, 2017
  90. 16/19 unpack-trees: check if we can perform the operation for submodulesStefan Beller, Mar 14, 2017
  91. 09/19 update submodules: add submodule config parsingStefan Beller, Mar 14, 2017
  92. 19/19 builtin/read-tree: add --recurse-submodules switchStefan Beller, Mar 14, 2017
  93. 15/19 unpack-trees: pass old oid to verify_clean_submoduleStefan Beller, Mar 14, 2017
  94. 06/19 lib-submodule-update.sh: replace sha1 by hashStefan Beller, Mar 14, 2017
  95. 08/19 make is_submodule_populated gentlyStefan Beller, Mar 14, 2017
  96. 12/19 update submodules: move up prepare_submodule_repo_envStefan Beller, Mar 14, 2017
  97. 13/19 submodule.c: get_super_prefix_or_emptyStefan Beller, Mar 14, 2017
  98. 03/19 lib-submodule-update.sh: reorder create_lib_submodule_repoStefan Beller, Mar 14, 2017
  99. 10/19 update submodules: add a config option to determine if submodules are updatedStefan Beller, Mar 14, 2017
  100. Brandon WilliamsMar 15, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.