summaryrefslogtreecommitdiffstats
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/submodule-recursive-fetch-gets-the-tip'Junio C Hamano2019-01-291-45/+239
|\
| * fetch: ensure submodule objects fetchedStefan Beller2018-12-091-29/+177
| * submodule.c: fetch in submodules git directory instead of in worktreeStefan Beller2018-12-051-2/+8
| * submodule: migrate get_next_submodule to use repository structsStefan Beller2018-12-051-12/+44
| * submodule: store OIDs in changed_submodule_namesStefan Beller2018-12-051-9/+10
| * submodule.c: tighten scope of changed_submodule_names structStefan Beller2018-12-051-8/+11
| * submodule.c: sort changed_submodule_names before searching itStefan Beller2018-12-051-1/+2
| * submodule.c: fix indentationStefan Beller2018-12-051-3/+6
* | submodule: unset core.worktree if no working tree is presentStefan Beller2018-12-261-0/+14
|/
* Merge branch 'ao/submodule-wo-gitmodules-checked-out'Junio C Hamano2018-11-131-7/+21
|\
| * submodule: add a helper to check if it is safe to write to .gitmodulesAntonio Ospite2018-10-091-0/+18
| * submodule: factor out a config_set_in_gitmodules_file_gently functionAntonio Ospite2018-10-091-7/+3
* | submodule.c: remove some of the_repository referencesNguyễn Thái Ngọc Duy2018-10-221-25/+32
* | Merge branch 'sm/show-superproject-while-conflicted'Junio C Hamano2018-10-191-1/+1
|\ \
| * | rev-parse: --show-superproject-working-tree should work during a mergeSam McKelvie2018-09-281-1/+1
* | | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-14/+20
|\ \ \
| * | | revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+3
| * | | submodule.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-11/+17
| | |/ | |/|
* | | Merge branch 'bp/mv-submodules-with-fsmonitor'Junio C Hamano2018-09-241-2/+1
|\ \ \
| * | | git-mv: allow submodules and fsmonitor to work togetherBen Peart2018-09-121-2/+1
* | | | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-1/+1
|\ \ \ \
| * | | | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
* | | | | Merge branch 'ds/reachable'Junio C Hamano2018-09-171-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | commit.h: remove method declarationsDerrick Stolee2018-07-201-0/+1
* | | | | Revert "Merge branch 'sb/submodule-core-worktree'"Jonathan Nieder2018-09-071-14/+0
| |/ / / |/| | |
* | | | submodule.c: use the right index instead of the_indexNguyễn Thái Ngọc Duy2018-08-131-4/+4
* | | | dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy2018-08-131-1/+1
* | | | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-021-2/+2
|\| | |
| * | | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-2/+2
* | | | Merge branch 'sb/submodule-move-head-error-msg'Junio C Hamano2018-07-241-1/+1
|\ \ \ \
| * | | | submodule.c: report the submodule that an error occurs inStefan Beller2018-06-251-1/+1
* | | | | Merge branch 'sb/submodule-core-worktree'Junio C Hamano2018-07-181-0/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | submodule: unset core.worktree if no working tree is presentStefan Beller2018-06-141-0/+14
| | |/ / | |/| |
* / | | submodule: fix NULL correctness in renamed broken submodulesStefan Beller2018-06-141-2/+4
|/ / /
* | | Merge branch 'jt/submodule-pull-recurse-rebase'Junio C Hamano2018-06-041-2/+4
|\ \ \
| * | | submodule: do not pass null OID to setup_revisionsJonathan Tan2018-05-251-2/+4
| | |/ | |/|
* | | Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano2018-05-301-166/+2
|\ \ \
| * | | submodule.c: move submodule merging to merge-recursive.cStefan Beller2018-05-161-166/+2
* | | | Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano2018-05-301-10/+9
|\ \ \ \
| * | | | submodule: convert push_unpushed_submodules to take a struct refspecBrandon Williams2018-05-181-10/+9
| |/ / /
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-3/+3
|\ \ \ \
| * | | | submodule: convert several uses of EMPTY_TREE_SHA1_HEXbrian m. carlson2018-05-021-3/+3
* | | | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-4/+4
|\ \ \ \ \
| * | | | | Convert remaining die*(BUG) messagesJohannes Schindelin2018-05-061-1/+1
| * | | | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-3/+3
| |/ / / /
* | | | | Merge branch 'sb/oid-object-info'Junio C Hamano2018-05-231-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | cache.h: add repository argument to oid_object_infoStefan Beller2018-04-261-1/+1
| |/ / /
* | | | Merge branch 'sb/submodule-move-nested'Junio C Hamano2018-05-081-19/+21
|\ \ \ \ | |/ / / |/| | |
| * | | submodule: fixup nested submodules after moving the submoduleStefan Beller2018-03-291-3/+3
| * | | submodule-config: remove submodule_from_cacheStefan Beller2018-03-291-2/+2