summaryrefslogtreecommitdiffstats
path: root/submodule-config.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ao/submodule-wo-gitmodules-checked-out'Junio C Hamano2018-11-131-2/+66
|\
| * submodule: support reading .gitmodules when it's not in the working treeAntonio Ospite2018-10-311-2/+29
| * submodule: factor out a config_set_in_gitmodules_file_gently functionAntonio Ospite2018-10-091-0/+12
| * submodule: add a print_config_from_gitmodules() helperAntonio Ospite2018-10-091-0/+25
* | Sync with 2.19.1Junio C Hamano2018-09-271-0/+10
|\ \
| * \ Sync with 2.18.1Junio C Hamano2018-09-271-0/+10
| |\ \ | | |/ | |/|
| | * Sync with 2.17.2Junio C Hamano2018-09-271-0/+10
| | |\
| | | * Sync with 2.15.3Junio C Hamano2018-09-271-0/+10
| | | |\
| | | | * Sync with Git 2.14.4Junio C Hamano2018-09-271-0/+10
| | | | |\
| | | | | * submodule-config: ban submodule paths that start with a dashJeff King2018-09-271-0/+2
| | | | | * submodule-config: ban submodule urls that start with dashJeff King2018-09-271-0/+8
* | | | | | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-2/+2
|/ / / / /
* | | | | Merge branch 'jk/fsck-gitmodules-gently'Junio C Hamano2018-08-021-1/+1
|\ \ \ \ \
| * | | | | config: add options parameter to git_config_from_memJeff King2018-07-031-1/+1
| |/ / / /
* | | | | Merge branch 'ao/config-from-gitmodules'Junio C Hamano2018-07-181-12/+63
|\ \ \ \ \
| * | | | | submodule-config: reuse config_from_gitmodules in repo_read_gitmodulesAntonio Ospite2018-06-261-29/+21
| * | | | | submodule-config: pass repository as argument to config_from_gitmodulesAntonio Ospite2018-06-261-5/+5
| * | | | | submodule-config: make 'config_from_gitmodules' privateAntonio Ospite2018-06-261-4/+4
| * | | | | submodule-config: add helper to get 'update-clone' config from .gitmodulesAntonio Ospite2018-06-261-0/+14
| * | | | | submodule-config: add helper function to get 'fetch' config from .gitmodulesAntonio Ospite2018-06-261-0/+28
| * | | | | config: move config_from_gitmodules to submodule-config.cAntonio Ospite2018-06-261-0/+17
| |/ / / /
* | | | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-33/+33
|\ \ \ \ \
| * | | | | submodule-config: convert structures to object_idbrian m. carlson2018-05-021-33/+33
| |/ / / /
* | | | | Sync with Git 2.17.1Junio C Hamano2018-05-291-0/+31
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Sync with Git 2.15.2Junio C Hamano2018-05-221-0/+31
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Sync with Git 2.14.4Junio C Hamano2018-05-221-0/+31
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Sync with Git 2.13.7Junio C Hamano2018-05-221-0/+31
| | | |\ \
| | | | * | submodule-config: verify submodule names as pathsJeff King2018-05-211-0/+31
* | | | | | Merge branch 'sb/submodule-move-nested'Junio C Hamano2018-05-081-18/+11
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | submodule-config: remove submodule_from_cacheStefan Beller2018-03-291-9/+0
| * | | | | submodule-config: add repository argument to submodule_from_{name, path}Stefan Beller2018-03-291-6/+8
| * | | | | submodule-config: allow submodule_free to handle arbitrary repositoriesStefan Beller2018-03-291-3/+3
| | |/ / / | |/| | |
* | | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
| |/ / / |/| | |
* | | | Correct mispellings of ".gitmodule" to ".gitmodules"Robert P. J. Day2018-02-141-2/+2
|/ / /
* | | 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
| | |_|_|/ | |/| | |