mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ms/submodule-foreach-fix'

Browse Source 
"git submodule foreach" did not protect command line options passed
to the command to be run in each submodule correctly, when the
"--recursive" option was in use.

* ms/submodule-foreach-fix:
  submodule foreach: fix recursion of options
This commit is contained in:
Junio C Hamano
2019-07-09 15:25:46 -07:00
parent 88b1075759 30db18b148
commit 968eecbd01
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/submodule--helper.c
View File

@ -540,6 +540,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
if (info->quiet) if (info->quiet)
argv_array_push(&cpr.args, "--quiet"); argv_array_push(&cpr.args, "--quiet");
argv_array_push(&cpr.args, "--");
argv_array_pushv(&cpr.args, info->argv); argv_array_pushv(&cpr.args, info->argv);
if (run_command(&cpr)) if (run_command(&cpr))

7
t/t7407-submodule-foreach.sh
View File

@ -421,4 +421,11 @@ test_expect_success 'option-like arguments passed to foreach commands are not lo
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'option-like arguments passed to foreach recurse correctly' '
git -C clone2 submodule foreach --recursive "echo be --an-option" >expect &&
git -C clone2 submodule foreach --recursive echo be --an-option >actual &&
grep -e "--an-option" expect &&
test_cmp expect actual
'
test_done test_done