summaryrefslogtreecommitdiff
path: root/builtin/submodule--helper.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-09-281-4/+2
|\
| * refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-241-4/+2
* | consistently use "fallthrough" comments in switchesjk/fallthroughJeff King2017-09-221-0/+1
|/
* Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-22/+29
|\
| * submodule: remove gitmodules_configBrandon Williams2017-08-031-14/+0
| * submodule: remove submodule_config callback routineBrandon Williams2017-08-031-1/+0
| * submodule--helper: don't overlay config in update-cloneBrandon Williams2017-08-031-4/+19
| * submodule--helper: don't overlay config in remote_submodule_branchBrandon Williams2017-08-031-4/+11
| * Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-021-4/+4
| |\
* | \ Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-221-4/+13
|\ \ \ | |/ /
| * | submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-021-4/+13
* | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-08-221-9/+40
|\ \ \
| * | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodulesBrandon Williams2017-07-201-9/+40
* | | | Merge branch 'js/run-process-parallel-api-fix'Junio C Hamano2017-08-111-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | run_processes_parallel: change confusing task_cb conventionjs/run-process-parallel-api-fixJohannes Schindelin2017-07-211-1/+1
* | | | submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-171-4/+4
| |_|/ |/| |
* | | Merge branch 'jc/utf8-fprintf'Junio C Hamano2017-07-061-3/+2
|\ \ \
| * | | submodule--helper: do not call utf8_fprintf() unnecessarilyjc/utf8-fprintfJunio C Hamano2017-06-281-3/+2
| |/ /
* | | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-231-4/+5
| | |
| \ \
*-. \ \ Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-231-0/+1
|\ \ \ \
| | * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | | Merge branch 'jk/consistent-h'Junio C Hamano2017-06-191-3/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | submodule--helper: show usage for "-h"Jeff King2017-05-301-3/+2
| |/ / /
* | | | pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAPBrandon Williams2017-05-121-2/+1
|/ / /
* | | Merge branch 'jk/submodule-init-segv-fix'Junio C Hamano2017-05-011-3/+3
|\ \ \
| * | | submodule_init: die cleanly on submodules without url definedjk/submodule-init-segv-fixJeff King2017-04-241-3/+3
* | | | Merge branch 'bw/submodule-is-active'Junio C Hamano2017-04-191-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | submodule--helper: fix typo in is_active error messagebw/submodule-is-activeStefan Beller2017-04-131-1/+1
* | | | submodule--helper: add push-check subcommandBrandon Williams2017-04-111-0/+45
* | | | Merge branch 'bw/submodule-is-active'Junio C Hamano2017-03-301-12/+56
|\ \ \ \ | |/ / /
| * | | submodule--helper init: set submodule.<name>.activeBrandon Williams2017-03-181-0/+12
| * | | submodule init: initialize active submodulesBrandon Williams2017-03-181-0/+30
| * | | submodule--helper clone: check for configured submodules using helperBrandon Williams2017-03-171-12/+3
| * | | submodule--helper: add is-active subcommandBrandon Williams2017-03-171-0/+11
* | | | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-281-20/+2
|\ \ \ \ | |/ / / |/| | |
| * | | submodule--helper.c: remove duplicate codeValery Tolstov2017-03-151-20/+2
* | | | submodule init: warn about falling back to a local pathsb/submodule-init-url-selectionStefan Beller2017-02-281-5/+3
|/ / /
* | | Merge branch 'rs/absolute-pathdup'Junio C Hamano2017-02-021-1/+1
|\ \ \
| * | | use absolute_pathdup()rs/absolute-pathdupRené Scharfe2017-01-271-1/+1
| | |/ | |/|
* | | Merge branch 'sb/submodule-init'Junio C Hamano2017-01-231-6/+7
|\ \ \
| * | | submodule update --init: display correct path from submodulesb/submodule-initStefan Beller2017-01-121-6/+7
* | | | Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-101-11/+58
|\ \ \ \ | |/ / /
| * | | submodule: add absorb-git-dir functionStefan Beller2016-12-121-0/+38
| * | | submodule helper: support super prefixStefan Beller2016-12-091-11/+20
* | | | submodule--helper: set alternateLocation for cloned submodulesvs/submodule-clone-nested-submodules-alternatesVitaly "_Vi" Shukela2016-12-121-2/+17
|/ / /
* | | Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2016-10-271-2/+6
|\ \ \
| * | | submodule: ignore trailing slash in relative urlStefan Beller2016-10-101-0/+2
| * | | submodule: ignore trailing slash on superproject URLStefan Beller2016-10-101-2/+4
* | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-171-8/+3
|\ \ \ \
| * | | | alternates: use a separate scratch spaceJeff King2016-10-101-8/+3