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

Re: [PATCH 2/4] lib-submodule-update: consolidate --recurse-submodules

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 29, 2020, 18:06 UTC
Message-ID
<xmqqtv12w4i2.fsf@gitster.c.googlers.com>
In-Reply-To
<d5809877af3e20eb9ff459a91d3099846fd32197.1588162842.git.liu.denton@gmail.com>
Denton Liu <liu.denton@gmail.com> writes:
Show 6 quoted lines
> Both test_submodule_switch_recursing_with_args() and
> test_submodule_forced_switch_recursing_with_args() call the internal
> function test_submodule_recursing_with_args_common() with the final
> argument of `--recurse-submodules`. Consolidate this duplication by
> appending the argument in test_submodule_recursing_with_args_common().
>

OK, I just made sure that these two are the only callers and they both pass the "--recurse-submodules", so the patch looks quite sensible.

Thanks.
Show 36 quoted lines
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
>  t/lib-submodule-update.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
> index a3732d3f6c..81457b4c31 100644
> --- a/t/lib-submodule-update.sh
> +++ b/t/lib-submodule-update.sh
> @@ -632,7 +632,7 @@ test_submodule_forced_switch () {
>  # Internal function; use test_submodule_switch_recursing_with_args() or
>  # test_submodule_forced_switch_recursing_with_args() instead.
>  test_submodule_recursing_with_args_common () {
> -	command="$1"
> +	command="$1 --recurse-submodules"
>  
>  	######################### Appearing submodule #########################
>  	# Switching to a commit letting a submodule appear checks it out ...
> @@ -840,7 +840,7 @@ test_submodule_recursing_with_args_common () {
>  # test_submodule_switch_recursing_with_args "$GIT_COMMAND"
>  test_submodule_switch_recursing_with_args () {
>  	cmd_args="$1"
> -	command="git $cmd_args --recurse-submodules"
> +	command="git $cmd_args"
>  	test_submodule_recursing_with_args_common "$command"
>  
>  	RESULTDS=success
> @@ -957,7 +957,7 @@ test_submodule_switch_recursing_with_args () {
>  # away local changes in the superproject is allowed.
>  test_submodule_forced_switch_recursing_with_args () {
>  	cmd_args="$1"
> -	command="git $cmd_args --recurse-submodules"
> +	command="git $cmd_args"
>  	test_submodule_recursing_with_args_common "$command"
>  
>  	RESULT=success
Previous: Denton LiuNext: Denton Liu
Message 5 of 64 in “t: replace incorrect test_must_fail usage (part 5)”
  1. 0/4 t: replace incorrect test_must_fail usage (part 5)Denton Liu, Apr 29, 2020
  2. 1/4 lib-submodule-update: add space after function nameDenton Liu, Apr 29, 2020
  3. 3/4 lib-submodule-update: prepend "git" to $commandDenton Liu, Apr 29, 2020
  4. 2/4 lib-submodule-update: consolidate --recurse-submodulesDenton Liu, Apr 29, 2020
  5. Junio C HamanoApr 29, 2020
  6. 4/4 lib-submodule-update: pass OVERWRITING_FAILDenton Liu, Apr 29, 2020
  7. Junio C HamanoApr 29, 2020
  8. Denton LiuApr 30, 2020
  9. Junio C HamanoApr 30, 2020
  10. Denton LiuApr 30, 2020
  11. lib-submodule-update: pass OVERWRITING_FAILDenton Liu, Apr 30, 2020
  12. Junio C HamanoApr 30, 2020
  13. Denton LiuMay 1, 2020
  14. Junio C HamanoMay 1, 2020
  15. lib-submodule-update: pass OVERWRITING_FAILDenton Liu, May 5, 2020
  16. Taylor BlauApr 29, 2020
  17. Johannes SixtApr 29, 2020
  18. Re* [PATCH 0/4] t: replace incorrect test_must_fail usage (part 5)Junio C Hamano, Apr 29, 2020
  19. Taylor BlauApr 29, 2020
  20. Junio C HamanoApr 29, 2020
  21. Taylor BlauApr 29, 2020
  22. Junio C HamanoApr 29, 2020
  23. Taylor BlauApr 29, 2020
  24. Eric SunshineApr 29, 2020
  25. Junio C HamanoApr 29, 2020
  26. 0/4 t: replace incorrect test_must_fail usage (part 5)Denton Liu, May 21, 2020
  27. 1/4 lib-submodule-update: add space after function nameDenton Liu, May 21, 2020
  28. 2/4 lib-submodule-update: consolidate --recurse-submodulesDenton Liu, May 21, 2020
  29. 3/4 lib-submodule-update: prepend "git" to $commandDenton Liu, May 21, 2020
  30. Philip OakleyMay 21, 2020
  31. Denton LiuMay 21, 2020
  32. 4/4 lib-submodule-update: pass OVERWRITING_FAILDenton Liu, May 21, 2020
  33. Jeff KingMay 21, 2020
  34. Denton LiuMay 21, 2020
  35. Junio C HamanoMay 21, 2020
  36. Jeff KingMay 21, 2020
  37. Jeff KingMay 21, 2020
  38. Junio C HamanoMay 21, 2020
  39. Jeff KingMay 21, 2020
  40. 0/4 t: replace incorrect test_must_fail usage (part 5)Denton Liu, Jun 11, 2020
  41. 1/4 lib-submodule-update: add space after function nameDenton Liu, Jun 11, 2020
  42. 2/4 lib-submodule-update: consolidate --recurse-submodulesDenton Liu, Jun 11, 2020
  43. 3/4 lib-submodule-update: prepend "git" to $commandDenton Liu, Jun 11, 2020
  44. 4/4 lib-submodule-update: use callbacks in test_submodule_switch_common()Denton Liu, Jun 11, 2020
  45. Junio C HamanoJun 12, 2020
  46. Junio C HamanoJun 18, 2020
  47. 0/4 t: replace incorrect test_must_fail usage (part 5)Denton Liu, Jun 18, 2020
  48. 1/4 lib-submodule-update: add space after function nameDenton Liu, Jun 18, 2020
  49. 2/4 lib-submodule-update: consolidate --recurse-submodulesDenton Liu, Jun 18, 2020
  50. 3/4 lib-submodule-update: prepend "git" to $commandDenton Liu, Jun 18, 2020
  51. 4/4 lib-submodule-update: use callbacks in test_submodule_switch_common()Denton Liu, Jun 18, 2020
  52. Jeff KingJun 18, 2020
  53. 0/4 t: replace incorrect test_must_fail usage (part 5)Denton Liu, Jun 23, 2020
  54. 1/4 lib-submodule-update: add space after function nameDenton Liu, Jun 23, 2020
  55. 2/4 lib-submodule-update: consolidate --recurse-submodulesDenton Liu, Jun 23, 2020
  56. 4/4 lib-submodule-update: use callbacks in test_submodule_switch_common()Denton Liu, Jun 23, 2020
  57. 3/4 lib-submodule-update: prepend "git" to $commandDenton Liu, Jun 23, 2020
  58. Jeff KingJun 23, 2020
  59. lib-submodule-update: pass 'test_must_fail' as an argumentDenton Liu, Jun 23, 2020
  60. lib-submodule-update: pass 'test_must_fail' as an argumentDenton Liu, Jun 23, 2020
  61. Junio C HamanoJun 23, 2020
  62. Đoàn Trần Công DanhJun 24, 2020
  63. lib-submodule-update: pass 'test_must_fail' as an argumentDenton Liu, Jun 24, 2020
  64. Junio C HamanoJun 24, 2020

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.