aboutsummaryrefslogtreecommitdiffstats
path: root/submodule.c
AgeCommit message (Expand)AuthorFilesLines
2016-04-16submodule: port init from shell to CStefan Beller1-0/+21
2016-04-14Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-initJunio C Hamano1-9/+7
2016-03-04Merge branch 'sb/submodule-parallel-fetch'Junio C Hamano1-4/+3
2016-03-01fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller1-1/+15
2016-03-01submodule-config: keep update strategy aroundStefan Beller1-0/+21
2016-03-01run-command: do not pass child process data into callbacksStefan Beller1-4/+3
2016-02-26Merge branch 'ps/config-error'Junio C Hamano1-6/+4
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano1-3/+3
2016-02-22use st_add and st_mult for allocation size computationJeff King1-3/+3
2016-02-22config: rename git_config_set_or_die to git_config_setPatrick Steinhardt1-3/+3
2016-02-22config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt1-1/+1
2016-02-22submodule: die on config error when linking modulesPatrick Steinhardt1-5/+3
2015-12-16submodules: allow parallel fetching, add tests and documentationStefan Beller1-2/+1
2015-12-16fetch_populated_submodules: use new parallel job processingStefan Beller1-44/+98
2015-12-16submodule.c: write "Fetching submodule <foo>" to stderrJonathan Nieder1-1/+1
2015-11-20Remove get_object_hash.brian m. carlson1-1/+1
2015-11-20Convert struct object to object_idbrian m. carlson1-3/+3
2015-11-20Add several uses of get_object_hash.brian m. carlson1-1/+1
2015-11-03Merge branch 'jk/initialization-fix-to-add-submodule-odb'Junio C Hamano1-1/+1
2015-10-28add_submodule_odb: initialize alt_odb list earlierJeff King1-1/+1
2015-10-20Merge branch 'jk/war-on-sprintf'Junio C Hamano1-2/+4
2015-10-05avoid sprintf and strcpy with flex arraysJeff King1-2/+4
2015-09-14submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()Max Kirillov1-8/+1
2015-08-31Merge branch 'jc/am-state-fix'Junio C Hamano1-1/+1
2015-08-31Merge branch 'hv/submodule-config'Junio C Hamano1-96/+26
2015-08-25write_file(): drop caller-supplied LF from calls to create a one-liner fileJunio C Hamano1-1/+1
2015-08-24write_file(): drop "fatal" parameterJunio C Hamano1-1/+1
2015-08-19submodule: allow erroneous values for the fetchRecurseSubmodules optionHeiko Voigt1-15/+0
2015-08-19submodule: use new config API for worktree configurationsHeiko Voigt1-134/+26
2015-08-19submodule: extract functions for config set and lookupHeiko Voigt1-45/+97
2015-08-19submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt1-0/+1
2015-06-29convert "enum date_mode" into a structJeff King1-1/+1
2015-06-05Merge branch 'bc/object-id'Junio C Hamano1-3/+4
2015-06-01Merge branch 'rs/janitorial'Junio C Hamano1-2/+1
2015-05-25submodule: rewrite to take an object_id argumentMichael Haggerty1-15/+7
2015-05-25each_ref_fn: change to take an object_id parameterMichael Haggerty1-3/+12
2015-05-20use file_exists() to check if a file exists in the worktreeRené Scharfe1-2/+1
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano1-7/+2
2015-03-22submodule: use capture_commandJeff King1-3/+1
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano1-1/+1
2014-12-01use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy1-7/+2
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano1-1/+1
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe1-14/+7
2014-07-23Merge branch 'ta/string-list-init'Junio C Hamano1-4/+1
2014-07-21replace memset with string-list initializersTanay Abhra1-4/+1
2014-06-30submodule.c: use the ARRAY_SIZE macroElia Pinto1-1/+1
2014-02-27Merge branch 'kb/fast-hashmap'Junio C Hamano1-24/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-1/+1
2013-11-07submodule: don't access the .gitmodules cache entry after removing itJens Lehmann1-24/+1
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-0/+149
2013-09-04Merge branch 'jl/some-submodule-config-are-not-boolean'Junio C Hamano1-0/+6
2013-08-19avoid segfault on submodule.*.path set to an empty "true"Jharrod LaFon1-0/+6
2013-08-06rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann1-0/+33
2013-08-06mv: update the path entry in .gitmodules for moved submodulesJens Lehmann1-0/+34
2013-07-30submodule.c: add .gitmodules staging helper functionsJens Lehmann1-0/+51
2013-07-30mv: move submodules using a gitfileJens Lehmann1-0/+31
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano1-1/+1
2013-07-12Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano1-0/+1
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-1/+1
2013-06-26pretty: --format output should honor logOutputEncodingAlexey Shumkin1-0/+1
2013-06-14Merge branch 'mh/reflife'Junio C Hamano1-4/+2
2013-06-09submodule: remove redundant check for the_index.initializedRené Scharfe1-3/+2
2013-05-28find_first_merges(): remove unnecessary codeMichael Haggerty1-2/+1
2013-05-28find_first_merges(): initialize merges variable using initializerMichael Haggerty1-2/+1
2013-04-05submodule: print graph output next to submodule logJohn Keeping1-4/+9
2013-03-22submodule: clarify logic in show_submodule_summaryJeff King1-7/+6
2013-01-23submodule: simplify memory handling in config parsingJeff King1-16/+14
2013-01-23submodule: use parse_config_key when parsing configJeff King1-9/+10
2012-11-18submodule: display summary header in boldRamkumar Ramachandra1-4/+4
2012-10-29Merge branch 'jl/submodule-rm'Jeff King1-0/+80
2012-09-29submodule: teach rm to remove submodules unless they contain a git directoryJens Lehmann1-0/+80
2012-09-11Merge branch 'jk/argv-array'Junio C Hamano1-15/+16
2012-09-11Merge branch 'jc/merge-bases'Junio C Hamano1-6/+6
2012-09-02submodule: use argv_array instead of hand-building arraysJens Lehmann1-15/+16
2012-08-27in_merge_bases(): support only one "other" commitJunio C Hamano1-6/+6
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-2/+1
2012-08-03diff_setup_done(): return voidThomas Rast1-2/+1
2012-05-23Merge branch 'hv/submodule-alt-odb'Junio C Hamano1-0/+3
2012-05-14teach add_submodule_odb() to look for alternatesHeiko Voigt1-0/+3
2012-03-30push: teach --recurse-submodules the on-demand optionHeiko Voigt1-0/+48
2012-03-30Refactor submodule push check to use string list instead of integerHeiko Voigt1-12/+11
2012-03-30Teach revision walking machinery to walk multiple times sequenciallyHeiko Voigt1-0/+2
2011-12-17submodule: use diff_tree_combined_merge() instead of diff_tree_combined()René Scharfe1-11/+3
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-9/+5
2011-12-13Merge branch 'jl/submodule-status-failure-report'Junio C Hamano1-2/+2
2011-12-08diff/status: print submodule path when looking for changes failsJens Lehmann1-2/+2
2011-12-05Merge branch 'ab/clang-lints'Junio C Hamano1-1/+1
2011-11-06cast variable in call to free() in builtin/diff.c and submodule.cÆvar Arnfjörð Bjarmason1-1/+1
2011-10-13submodule: Search for merges only at end of recursive mergeBrad King1-1/+5
2011-10-05Merge branch 'jk/argv-array'Junio C Hamano1-35/+6
2011-10-05Merge branch 'jk/maint-fetch-submodule-check-fix'Junio C Hamano1-5/+72
2011-09-14refactor argv_array into generic codeJeff King1-35/+6
2011-09-12fetch: avoid quadratic loop checking for updated submodulesJeff King1-5/+72
2011-09-12Sync with 1.7.6.3Junio C Hamano1-0/+4
2011-09-12Merge branch 'jl/maint-fetch-submodule-check-fix' into maintJunio C Hamano1-0/+4
2011-09-09fetch: skip on-demand checking when no submodules are configuredJens Lehmann1-0/+4
2011-09-02Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano1-0/+108
2011-08-28Merge branch 'nd/maint-clone-gitdir'Junio C Hamano1-3/+3
2011-08-22read_gitfile_gently(): rename misnamed function to read_gitfile()Junio C Hamano1-3/+3
2011-08-20push: Don't push a repository with unpushed submodulesFredrik Gustafsson1-0/+108
2011-08-01Merge branch 'jl/maint-fetch-recursive-fix' into maintJunio C Hamano1-0/+1
2011-07-13Merge branch 'jl/maint-fetch-recursive-fix'Junio C Hamano1-0/+1
2011-06-20fetch: Also fetch submodules in subdirectories in on-demand modeJens Lehmann1-0/+1
2011-05-14Submodules: Don't parse .gitmodules when it contains, merge conflictsJens Lehmann1-2/+29
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano1-12/+140
2011-03-22Fix sparse warningsStephen Boyd1-3/+3
2011-03-16diff --submodule: split into bite-sized piecesJonathan Nieder1-42/+61
2011-03-09fetch/pull: Don't recurse into a submodule when commits are already presentJens Lehmann1-1/+28
2011-03-09Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' optionJens Lehmann1-2/+7
2011-03-09config: teach the fetch.recurseSubmodules option the 'on-demand' valueJens Lehmann1-1/+1
2011-03-09fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann1-2/+6
2011-03-09fetch/pull: recurse into submodules when necessaryJens Lehmann1-7/+99
2010-12-09fetch_populated_submodules(): document dynamic allocationJunio C Hamano1-1/+2
2010-11-12Submodules: Add the "fetchRecurseSubmodules" config optionJens Lehmann1-2/+18
2010-11-12Add the 'fetch.recurseSubmodules' config settingJens Lehmann1-1/+17
2010-11-12fetch/pull: Add the --recurse-submodules optionJens Lehmann1-1/+65
2010-08-21Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano1-0/+161
2010-08-09Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin1-0/+4
2010-08-09Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann1-0/+19
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann1-1/+56
2010-07-07Implement automatic fast-forward merge for submodulesHeiko Voigt1-0/+161
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann1-0/+13
2010-04-10Teach diff --submodule and status to handle .git files in submodulesJens Lehmann1-17/+16
2010-03-13git status: ignoring untracked files must apply to submodules tooJens Lehmann1-2/+7
2010-03-04git diff --submodule: Show detailed dirty status of submodulesJens Lehmann1-5/+35
2010-02-24is_submodule_modified(): clear environment properlyGiuseppe Bilotta1-11/+11
2010-01-31Fix memory leak in submodule.cJens Lehmann1-5/+9
2010-01-30is_submodule_modified(): fix breakage with external GIT_INDEX_FILEv1.7.0-rc1Junio C Hamano1-2/+5
2010-01-24Teach diff --submodule that modified submodule directory is dirtyJens Lehmann1-0/+3
2010-01-22Merge branch 'jl/submodule-diff'Junio C Hamano1-0/+49
2010-01-16Show submodules as modified when they contain a dirty work treeJens Lehmann1-0/+49
2010-01-12submodule.c: mark file-local function staticJunio C Hamano1-1/+1
2009-11-20submodule.c: Squelch a "use before assignment" warningDavid Aguilar1-1/+1
2009-10-30fixup tr/stash-format mergeJunio C Hamano1-2/+3
2009-10-19Add the --submodule option to the diff option familyJohannes Schindelin1-0/+113