git/t/t7400-submodule-basic.sh, branch v2.18.2

Merge branch 'cf/submodule-progress-dissociate'

2018-06-19T16:26:59Z

* cf/submodule-progress-dissociate: t7400: encapsulate setup code in test_expect_success

t7400: encapsulate setup code in test_expect_success

2018-06-19T16:25:56Z

When running t7400 in a shell you observe more output than expected: ... ok 8 - setup - hide init subdirectory ok 9 - setup - repository to add submodules to ok 10 - submodule add [master (root-commit) d79ce16] one Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 one.t ok 11 - redirected submodule add does not show progress ok 12 - redirected submodule add --progress does show progress ok 13 - submodule add to .gitignored path fails ... Fix the output by encapsulating the setup code in test_expect_success Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'cf/submodule-progress-dissociate'

2018-05-30T05:04:09Z

"git submodule update" and "git submodule add" supported the "--reference" option to borrow objects from a neighbouring local repository like "git clone" does, but lacked the more recent invention "--dissociate". Also "git submodule add" has been taught to take the "--progress" option. * cf/submodule-progress-dissociate: submodule: add --dissociate option to add/update commands submodule: add --progress option to add command submodule: clean up substitutions in script

submodule: add --progress option to add command

2018-05-22T03:17:10Z

The '--progress' was introduced in 72c5f88311d (clone: pass --progress decision to recursive submodules, 2016-09-22) to fix the progress reporting of the clone command. Also add the progress option to the 'submodule add' command. The update command already supports the progress flag, but it is not documented. Signed-off-by: Casey Fitzpatrick Signed-off-by: Junio C Hamano

submodule: check for NULL return of get_submodule_ref_store()

2018-03-28T22:27:02Z

If we can't find a ref store for a submodule then assume the latter is not initialized (or was removed). Print a status line accordingly instead of causing a segmentation fault by passing NULL as the first parameter of refs_head_ref(). Reported-by: Jeremy Feusi Reviewed-by: Stefan Beller Initial-Test-By: Stefan Beller Helped-by: Eric Sunshine Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

tests: fix diff order arguments in test_cmp

2017-10-07T01:56:08Z

Fix the argument order for test_cmp. When given the expected result first the diff shows the actual output with '+' and the expectation with '-', which is the convention for our tests. Signed-off-by: Stefan Beller Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'bw/submodule-config-cleanup'

2017-08-27T05:55:08Z

Code clean-up to avoid mixing values read from the .gitmodules file and values read from the .git/config file. * bw/submodule-config-cleanup: submodule: remove gitmodules_config unpack-trees: improve loading of .gitmodules submodule-config: lazy-load a repository's .gitmodules file submodule-config: move submodule-config functions to submodule-config.c submodule-config: remove support for overlaying repository config diff: stop allowing diff to have submodules configured in .git/config submodule: remove submodule_config callback routine unpack-trees: don't respect submodule.update submodule: don't rely on overlayed config when setting diffopts fetch: don't overlay config with submodule-config submodule--helper: don't overlay config in update-clone submodule--helper: don't overlay config in remote_submodule_branch add, reset: ensure submodules can be added or reset submodule: don't use submodule_from_name t7411: check configuration parsing errors

clone: teach recursive clones to respect -q

2017-08-04T16:08:37Z

Teach 'git clone --recurse-submodules' to respect the '-q' option by passing down the quiet flag to the process which handles cloning of submodules. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

t7411: check configuration parsing errors

2017-08-02T21:35:08Z

Check for configuration parsing errors in '.gitmodules' in t7411, which is explicitly testing the submodule-config subsystem, instead of in t7400. Also explicitly use the test helper instead of relying on the gitmodules file from being read in status. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

Merge branch 'bw/submodule-with-bs-path' into maint

2017-06-04T01:20:58Z

A hotfix to a topic that is already in v2.13. * bw/submodule-with-bs-path: t7400: add !CYGWIN prerequisite to 'add with \\ in path'