aboutsummaryrefslogtreecommitdiffstats
path: root/submodule.c
AgeCommit message (Expand)AuthorFilesLines
2018-11-13Merge branch 'ao/submodule-wo-gitmodules-checked-out'Junio C Hamano1-7/+21
2018-10-22submodule.c: remove some of the_repository referencesNguyễn Thái Ngọc Duy1-25/+32
2018-10-19Merge branch 'sm/show-superproject-while-conflicted'Junio C Hamano1-1/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-14/+20
2018-10-09submodule: add a helper to check if it is safe to write to .gitmodulesAntonio Ospite1-0/+18
2018-10-09submodule: factor out a config_set_in_gitmodules_file_gently functionAntonio Ospite1-7/+3
2018-09-28rev-parse: --show-superproject-working-tree should work during a mergeSam McKelvie1-1/+1
2018-09-24Merge branch 'bp/mv-submodules-with-fsmonitor'Junio C Hamano1-2/+1
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-3/+3
2018-09-21submodule.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-11/+17
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-1/+1
2018-09-17Merge branch 'ds/reachable'Junio C Hamano1-0/+1
2018-09-12git-mv: allow submodules and fsmonitor to work togetherBen Peart1-2/+1
2018-09-07Revert "Merge branch 'sb/submodule-core-worktree'"Jonathan Nieder1-14/+0
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-08-13submodule.c: use the right index instead of the_indexNguyễn Thái Ngọc Duy1-4/+4
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano1-2/+2
2018-07-24Merge branch 'sb/submodule-move-head-error-msg'Junio C Hamano1-1/+1
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-07-18Merge branch 'sb/submodule-core-worktree'Junio C Hamano1-0/+14
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-2/+2
2018-06-25submodule.c: report the submodule that an error occurs inStefan Beller1-1/+1
2018-06-14submodule: unset core.worktree if no working tree is presentStefan Beller1-0/+14
2018-06-14submodule: fix NULL correctness in renamed broken submodulesStefan Beller1-2/+4
2018-06-04Merge branch 'jt/submodule-pull-recurse-rebase'Junio C Hamano1-2/+4
2018-05-30Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano1-166/+2
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano1-10/+9
2018-05-30Merge branch 'bc/object-id'Junio C Hamano1-3/+3
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano1-4/+4
2018-05-25submodule: do not pass null OID to setup_revisionsJonathan Tan1-2/+4
2018-05-23Merge branch 'sb/oid-object-info'Junio C Hamano1-1/+1
2018-05-18submodule: convert push_unpushed_submodules to take a struct refspecBrandon Williams1-10/+9
2018-05-16submodule.c: move submodule merging to merge-recursive.cStefan Beller1-166/+2
2018-05-08Merge branch 'sb/submodule-move-nested'Junio C Hamano1-19/+21
2018-05-06Convert remaining die*(BUG) messagesJohannes Schindelin1-1/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-3/+3
2018-05-02submodule: convert several uses of EMPTY_TREE_SHA1_HEXbrian m. carlson1-3/+3
2018-04-26cache.h: add repository argument to oid_object_infoStefan Beller1-1/+1
2018-04-11Merge branch 'sb/object-store'Junio C Hamano1-0/+1
2018-03-29submodule: fixup nested submodules after moving the submoduleStefan Beller1-3/+3
2018-03-29submodule-config: remove submodule_from_cacheStefan Beller1-2/+2
2018-03-29submodule-config: add repository argument to submodule_from_{name, path}Stefan Beller1-14/+16
2018-03-23object-store: migrate alternates struct and functions from cache.hStefan Beller1-0/+1
2018-03-14sha1_file: convert sha1_object_info* to object_idbrian m. carlson1-1/+1
2018-03-14strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson1-2/+2
2018-02-22submodule: rename 'new' variablesBrandon Williams1-15/+15
2018-02-14object: rename function 'typename' to 'type_name'Brandon Williams1-1/+1
2018-01-05submodule: submodule_move_head omits old argument in forced caseStefan Beller1-1/+3
2017-12-27Merge branch 'bw/submodule-sans-cache-compat'Junio C Hamano1-14/+18
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-12-12submodule: convert get_next_submodule to not rely on the_indexBrandon Williams1-10/+13
2017-12-12submodule: used correct index in is_staging_gitmodules_okBrandon Williams1-2/+3
2017-12-12submodule: convert stage_updated_gitmodules to take a struct index_stateBrandon Williams1-2/+2
2017-12-06Merge branch 'sb/submodule-recursive-checkout-detach-head'Junio C Hamano1-1/+2
2017-11-21Merge branch 'bp/fsmonitor'Junio C Hamano1-1/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-8/+8
2017-11-06Merge branch 'hv/fetch-moved-submodules-on-demand'Junio C Hamano1-69/+131
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-8/+8
2017-11-01diff: remove DIFF_OPT_CLR macroBrandon Williams1-3/+3
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-4/+4
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams1-1/+1
2017-10-17submodule: simplify decision tree whether to or not to fetchHeiko Voigt1-37/+37
2017-10-17implement fetching of moved submodulesHeiko Voigt1-38/+100
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson1-1/+1
2017-10-03Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano1-1/+1
2017-10-03Merge branch 'hn/submodule-comment'Junio C Hamano1-0/+4
2017-10-01fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart1-1/+1
2017-09-29Merge branch 'ma/leakplugs'Junio C Hamano1-2/+2
2017-09-28submodule: correct error message for missing commitsStefan Beller1-1/+1
2017-09-26submodule.c: describe submodule_to_gitdir() in a new commentHan-Wen Nienhuys1-0/+4
2017-09-25Merge branch 'jn/per-repo-object-store-fixes'Junio C Hamano1-8/+25
2017-09-24object_array: use `object_array_clear()`, not `free()`Martin Ågren1-2/+2
2017-09-19Merge branch 'nd/prune-in-worktree'Junio C Hamano1-0/+9
2017-09-14push, fetch: error out for submodule entries not pointing to commitsStefan Beller1-8/+25
2017-09-10Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano1-3/+15
2017-08-26Merge branch 'bw/submodule-config-cleanup'Junio C Hamano1-95/+53
2017-08-26Merge branch 'sb/diff-color-move'Junio C Hamano1-47/+37
2017-08-24revision.c: --all adds HEAD from all worktreesNguyễn Thái Ngọc Duy1-0/+2
2017-08-24refs.c: move for_each_remote_ref_submodule() to submodule.cNguyễn Thái Ngọc Duy1-0/+7
2017-08-22Merge branch 'bw/grep-recurse-submodules'Junio C Hamano1-90/+67
2017-08-22Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano1-3/+15
2017-08-11Merge branch 'bc/object-id'Junio C Hamano1-16/+16
2017-08-03submodule: remove gitmodules_configBrandon Williams1-15/+0
2017-08-03submodule-config: move submodule-config functions to submodule-config.cBrandon Williams1-35/+0
2017-08-03submodule: remove submodule_config callback routineBrandon Williams1-23/+2
2017-08-03unpack-trees: don't respect submodule.updateBrandon Williams1-1/+0
2017-08-03submodule: don't rely on overlayed config when setting diffoptsBrandon Williams1-2/+10
2017-08-03fetch: don't overlay config with submodule-configBrandon Williams1-7/+17
2017-08-03submodule--helper: don't overlay config in update-cloneBrandon Williams1-12/+26
2017-08-02submodule: don't use submodule_from_nameBrandon Williams1-2/+0
2017-08-02Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano1-16/+16
2017-08-02submodule: merge repo_read_gitmodules and gitmodules_configBrandon Williams1-20/+17
2017-08-02submodule: check for unmerged .gitmodules outside of config parsingBrandon Williams1-24/+23
2017-08-02submodule: check for unstaged .gitmodules outside of config parsingBrandon Williams1-15/+17
2017-08-02submodule: remove fetch.recursesubmodules from submodule-config parsingBrandon Williams1-13/+6
2017-08-02submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams1-15/+1
2017-08-02cache.h: add GITMODULES_FILE macroBrandon Williams1-10/+10
2017-07-25recursive submodules: detach HEAD from new stateStefan Beller1-1/+2
2017-07-20submodule--helper: teach push-check to handle HEADBrandon Williams1-3/+15
2017-07-17submodule: convert submodule config lookup to use object_idbrian m. carlson1-16/+16
2017-07-13Merge branch 'sb/pull-rebase-submodule'Junio C Hamano1-0/+26
2017-07-05Merge branch 'bw/repo-object'Junio C Hamano1-12/+23
2017-06-30submodule.c: migrate diff output to use emit_diff_symbolStefan Beller1-47/+37
2017-06-27Spelling fixesVille Skyttä1-2/+2
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-23submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams1-12/+8
2017-06-23submodule: add repo_read_gitmodulesBrandon Williams1-0/+15
2017-06-23Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano1-0/+1
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Stefan Beller1-0/+26
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano1-9/+57
2017-06-01Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller1-2/+21
2017-05-30submodule loading: separate code path for .gitmodules and config overlayStefan Beller1-3/+11
2017-05-30reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller1-6/+27
2017-05-30Merge branch 'bw/pathspec-sans-the-index'Junio C Hamano1-0/+63
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-12/+12
2017-05-29Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano1-1/+2
2017-05-29Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano1-10/+11
2017-05-29Merge branch 'sb/reset-recurse-submodules'Junio C Hamano1-4/+27
2017-05-12pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flagBrandon Williams1-0/+33
2017-05-10submodule: add die_in_unpopulated_submodule functionBrandon Williams1-0/+30
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-7/+7
2017-05-08Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson1-4/+4
2017-05-08submodule: convert merge_submodule to use struct object_idbrian m. carlson1-12/+12
2017-05-08diff: recurse into nested submodules for inline diffStefan Beller1-1/+2
2017-05-04submodule: properly recurse for read-tree and checkoutStefan Beller1-1/+2
2017-05-04submodule: avoid auto-discovery in new working tree manipulator codeStefan Beller1-3/+3
2017-05-04submodule_move_head: reuse child_process structure for futher commandsStefan Beller1-6/+6
2017-05-02submodule: refactor logic to determine changed submodulesBrandon Williams1-142/+105
2017-05-02submodule: improve submodule_has_commits()Brandon Williams1-0/+34
2017-05-01submodule: change string_list changed_submodule_pathsBrandon Williams1-2/+2
2017-05-01submodule: remove add_oid_to_argv()Brandon Williams1-8/+2
2017-05-01submodule: rename free_submodules_sha1s()Brandon Williams1-2/+3
2017-05-01submodule: rename add_sha1_to_array()Brandon Williams1-4/+5
2017-04-23Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano1-2/+1
2017-04-19Merge branch 'nd/files-backend-git-dir'Junio C Hamano1-0/+31
2017-04-19Merge branch 'sb/submodule-rm-absorb'Junio C Hamano1-2/+2
2017-04-19Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano1-4/+70
2017-04-19Merge branch 'bc/object-id'Junio C Hamano1-33/+33
2017-04-19Merge branch 'sb/submodule-short-status'Junio C Hamano1-32/+43
2017-04-18submodule.c: submodule_move_head works with broken submodulesStefan Beller1-4/+24
2017-04-18submodule.c: uninitialized submodules are ignored in recursive commandsStefan Beller1-0/+3
2017-04-17submodule: remove a superfluous second check for the "new" variableSebastian Schuberth1-2/+1
2017-04-16Merge branch 'sb/show-diff-for-submodule-in-diff-fix'Junio C Hamano1-0/+1
2017-04-16Merge branch 'jk/snprintf-cleanups'Junio C Hamano1-1/+1
2017-04-13submodule.c: add missing ' in error messagesRalf Thielow1-2/+2
2017-04-11push: propagate remote and refspec with --recurse-submodulesBrandon Williams1-3/+60
2017-04-11push: propagate push-options with --recurse-submodulesBrandon Williams1-2/+11
2017-04-02diff: submodule inline diff to initialize env array.Stefan Beller1-0/+1
2017-03-31Rename sha1_array to oid_arraybrian m. carlson1-24/+24
2017-03-31Convert sha1_array_for_each_unique and for_each_abbrev to object_idbrian m. carlson1-10/+10
2017-03-31Make sha1_array_append take a struct object_id *brian m. carlson1-3/+3
2017-03-30convert unchecked snprintf into xsnprintfJeff King1-1/+1
2017-03-30Merge branch 'bw/submodule-is-active'Junio C Hamano1-8/+42
2017-03-29submodule.c: correctly handle nested submodules in is_submodule_modifiedStefan Beller1-2/+19
2017-03-28Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano1-32/+190
2017-03-28submodule: convert check_for_new_submodule_commits to object_idbrian m. carlson1-2/+2
2017-03-27path.c: move some code out of strbuf_git_path_submodule()Nguyễn Thái Ngọc Duy1-0/+31
2017-03-27submodule.c: stricter checking for submodules in is_submodule_modifiedStefan Beller1-2/+3
2017-03-27submodule.c: port is_submodule_modified to use porcelain 2Stefan Beller1-4/+5
2017-03-27submodule.c: convert is_submodule_modified to use strbuf_getwholelineStefan Beller1-16/+14
2017-03-27submodule.c: factor out early loop termination in is_submodule_modifiedStefan Beller1-8/+8
2017-03-27submodule.c: use argv_array in is_submodule_modifiedStefan Beller1-8/+2
2017-03-18submodule: decouple url and submodule interestBrandon Williams1-8/+42
2017-03-17Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano1-0/+82
2017-03-16update submodules: add submodule_move_headStefan Beller1-0/+137
2017-03-16submodule.c: get_super_prefix_or_emptyStefan Beller1-6/+10
2017-03-15update submodules: move up prepare_submodule_repo_envStefan Beller1-12/+17
2017-03-15submodules: introduce check to see whether to touch a submoduleStefan Beller1-0/+16
2017-03-15update submodules: add a config option to determine if submodules are updatedStefan Beller1-0/+6
2017-03-15make is_submodule_populated gentlyStefan Beller1-5/+2
2017-03-15connect_work_tree_and_git_dir: safely create leading directoriesStefan Beller1-9/+2
2017-03-08rev-parse: add --show-superproject-working-treeStefan Beller1-0/+82
2017-03-08real_pathdup(): fix callsites that wanted it to die on errorJohannes Schindelin1-5/+5
2017-01-26submodule absorbing: fix worktree/gitdir pointers recursively for non-movesStefan Beller1-16/+46
2017-01-18Merge branch 'sb/submodule-cleanup-export-git-dir-env'Junio C Hamano1-1/+2
2017-01-18Merge branch 'sb/submodule-rm-absorb'Junio C Hamano1-19/+38
2017-01-18Merge branch 'bw/grep-recurse-submodules'Junio C Hamano1-4/+54
2017-01-17Merge branch 'bw/push-dry-run' into maintJunio C Hamano1-5/+8
2017-01-17Merge branch 'hv/submodule-not-yet-pushed-fix' into maintJunio C Hamano1-26/+97
2017-01-10Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano1-24/+103
2017-01-07submodule.c: use GIT_DIR_ENVIRONMENT consistentlyStefan Beller1-1/+2
2016-12-27submodule: rename and add flags to ok_to_remove_submoduleStefan Beller1-12/+37
2016-12-27submodule: modernize ok_to_remove_submodule to use argv_arrayStefan Beller1-10/+4
2016-12-22submodules: load gitmodules file from commit sha1Brandon Williams1-0/+12
2016-12-22submodules: add helper to determine if a submodule is initializedBrandon Williams1-0/+23
2016-12-22submodules: add helper to determine if a submodule is populatedBrandon Williams1-0/+15
2016-12-16Merge branch 'bw/push-dry-run'Junio C Hamano1-5/+8
2016-12-16Merge branch 'hv/submodule-not-yet-pushed-fix'Junio C Hamano1-26/+97
2016-12-12real_path: have callers use real_pathdup and strbuf_realpathBrandon Williams1-1/+1
2016-12-12submodule: add absorb-git-dir functionStefan Beller1-0/+103
2016-12-12move connect_work_tree_and_git_dir to dir.hStefan Beller1-25/+0
2016-12-09submodule: use absolute path for computing relative path connectingStefan Beller1-6/+7
2016-11-23push: fix --dry-run to not push submodulesBrandon Williams1-5/+8
2016-11-16submodule_needs_pushing(): explain the behaviour when we cannot answerHeiko Voigt1-0/+11
2016-11-16batch check whether submodule needs pushing into one callHeiko Voigt1-29/+33
2016-11-16serialize collection of refs that contain submodule changesHeiko Voigt1-15/+20
2016-11-16serialize collection of changed submodulesHeiko Voigt1-4/+55