summaryrefslogtreecommitdiff
path: root/submodule-config.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-12/+53
|\
| * submodule-config: lazy-load a repository's .gitmodules fileBrandon Williams2017-08-031-5/+22
| * submodule-config: move submodule-config functions to submodule-config.cBrandon Williams2017-08-031-7/+31
| * Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-021-19/+19
| |\
* | \ Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-221-3/+3
|\ \ \
| * | | treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-071-2/+2
* | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-221-0/+8
|\ \ \ \ | | |/ / | |/| |
| * | | submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-021-0/+8
* | | | Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-111-6/+12
|\ \ \ \
| * | | | submodule-config.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-6/+12
* | | | | Merge branch 'bc/object-id'Junio C Hamano2017-08-111-19/+19
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-171-19/+19
* | | | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-131-0/+22
|\ \ \ \
| * | | | builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller2017-06-231-0/+22
* | | | | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-131-6/+8
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-301-6/+8
* | | | submodule-config: store the_submodule_cache in the_repositoryBrandon Williams2017-06-231-18/+52
|/ / /
* | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
|/ /
* | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-281-0/+20
|\ \
| * | update submodules: add submodule config parsingStefan Beller2017-03-151-0/+20
| |/
* | Merge branch 'sb/submodule-config-parse-ignore-fix'Junio C Hamano2017-03-211-1/+1
|\ \ | |/ |/|
| * submodule-config: correct error reporting for invalid ignore valuesb/submodule-config-parse-ignore-fixStefan Beller2017-03-151-1/+1
* | Merge branch 'bw/push-submodule-only'Junio C Hamano2017-01-311-0/+2
|\ \
| * | submodules: add RECURSE_SUBMODULES_ONLY valueBrandon Williams2016-12-201-0/+2
| |/
* | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-181-1/+1
|\ \
| * | submodules: load gitmodules file from commit sha1Brandon Williams2016-12-221-3/+3
| |/
* | submodule-config: rename commit_sha1 to treeish_nameStefan Beller2016-11-221-23/+23
* | submodule config: inline config_from_{name, path}Stefan Beller2016-11-221-14/+2
|/
* Merge branch 'sb/submodule-update-dot-branch'Junio C Hamano2016-08-101-1/+10
|\
| * submodule-config: keep configured branch aroundStefan Beller2016-08-011-1/+10
* | Merge branch 'va/i18n'Junio C Hamano2016-08-081-1/+1
|\ \
| * | i18n: config: unfold error messages marked for translationVasco Almeida2016-07-281-1/+1
| |/
* | Merge branch 'rs/submodule-config-code-cleanup'Junio C Hamano2016-08-031-16/+16
|\ \ | |/ |/|
| * submodule-config: combine early return code into one gotoHeiko Voigt2016-07-281-19/+12
| * submodule-config: passing name reference for .gitmodule blobsHeiko Voigt2016-07-281-9/+17
| * submodule-config: use explicit empty string instead of strbuf in config_from()René Scharfe2016-07-191-2/+1
| * Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-181-6/+6
| |\
| * \ Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maintJunio C Hamano2016-04-291-2/+1
| |\ \
* | \ \ Merge branch 'bc/cocci'Junio C Hamano2016-07-191-1/+1
|\ \ \ \
| * | | | coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-281-1/+1
* | | | | submodule-config: keep shallow recommendation aroundStefan Beller2016-05-271-0/+9
|/ / / /
* | | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-05-101-6/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | submodule-config: don't shadow `cache`sb/misc-cleanupsStefan Beller2016-04-281-6/+6
* | | | Merge branch 'ak/use-hashmap-iter-first-in-submodule-config'Junio C Hamano2016-04-131-2/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | submodule-config: use hashmap_iter_first()ak/use-hashmap-iter-first-in-submodule-configAlexander Kuleshov2016-03-231-2/+1
| |/ /
* | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-061-3/+16
|\ \ \ | |_|/ |/| |
| * | submodule-config: drop check against NULLStefan Beller2016-03-011-3/+3
| * | submodule-config: keep update strategy aroundStefan Beller2016-03-011-0/+13
* | | config: add 'origin_type' to config_source structLars Schneider2016-02-221-2/+2
* | | rename git_config_from_buf to git_config_from_memLars Schneider2016-02-191-1/+1
| |/ |/|