summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/misc-cppcheck-fixes'Junio C Hamano2017-04-231-2/+6
|\
| * am: close stream on error, but not stdinRené Scharfe2017-04-161-2/+6
* | Merge branch 'jk/snprintf-cleanups'Junio C Hamano2017-04-231-0/+1
|\ \
| * | replace: plug a memory leakjk/snprintf-cleanupsJunio C Hamano2017-04-171-0/+1
* | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2017-04-231-1/+0
|\ \ \
| * | | receive-pack: drop tmp_objdir_env from run_update_hookJeff King2017-04-161-1/+0
* | | | Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano2017-04-231-0/+1
|\ \ \ \
| * | | | read-cache: force_verify_index_checksumJeff Hostetler2017-04-151-0/+1
* | | | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-04-232-2/+2
|\ \ \ \ \
| * | | | | path.c: and an option to call real_path() in expand_user_path()Nguyễn Thái Ngọc Duy2017-04-142-2/+2
* | | | | | Merge branch 'ab/grep-plug-pathspec-leak'Junio C Hamano2017-04-191-0/+1
|\ \ \ \ \ \
| * | | | | | grep: plug a trivial memory leakab/grep-plug-pathspec-leakÆvar Arnfjörð Bjarmason2017-04-161-0/+1
* | | | | | | Merge branch 'nd/files-backend-git-dir'Junio C Hamano2017-04-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | refs: delete pack_refs() in favor of refs_pack_refs()Nguyễn Thái Ngọc Duy2017-04-141-1/+1
* | | | | | | | 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
* | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-04-192-2/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule--helper: add push-check subcommandBrandon Williams2017-04-111-0/+45
| * | | | | | | | | push: unmark a local variable as staticBrandon Williams2017-04-021-2/+3
* | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-04-1914-169/+169
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename sha1_array to oid_arraybrian m. carlson2017-03-317-31/+31
| * | | | | | | | | | Convert sha1_array_for_each_unique and for_each_abbrev to object_idbrian m. carlson2017-03-313-10/+10
| * | | | | | | | | | Convert sha1_array_lookup to take struct object_idbrian m. carlson2017-03-311-1/+1
| * | | | | | | | | | Convert remaining callers of sha1_array_lookup to object_idbrian m. carlson2017-03-311-8/+8
| * | | | | | | | | | Make sha1_array_append take a struct object_id *brian m. carlson2017-03-315-9/+9
| * | | | | | | | | | sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson2017-03-282-13/+13
| * | | | | | | | | | builtin/pull: convert to struct object_idbrian m. carlson2017-03-281-36/+36
| * | | | | | | | | | submodule: convert check_for_new_submodule_commits to object_idbrian m. carlson2017-03-281-3/+3
| * | | | | | | | | | builtin/receive-pack: convert portions to struct object_idbrian m. carlson2017-03-281-49/+49
| * | | | | | | | | | builtin/pull: convert portions to struct object_idbrian m. carlson2017-03-261-3/+3
| * | | | | | | | | | builtin/diff: convert to struct object_idbrian m. carlson2017-03-261-17/+17
| * | | | | | | | | | Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZbrian m. carlson2017-03-262-2/+2
| * | | | | | | | | | Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson2017-03-264-5/+5
* | | | | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-04-161-18/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | difftool: fix use-after-freejs/difftool-builtinJohannes Schindelin2017-04-131-2/+5
| * | | | | | | | | | | difftool: avoid strcpyJeff King2017-03-301-16/+15
* | | | | | | | | | | | Merge branch 'jk/loose-object-info-report-error'Junio C Hamano2017-04-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | index-pack: detect local corruption in collision checkjk/loose-object-info-report-errorJeff King2017-04-011-0/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'rs/update-hook-optim' into maintJunio C Hamano2017-03-281-8/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/shortlog-cleanup' into maintJunio C Hamano2017-03-281-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-name-cleanups' into maintJunio C Hamano2017-03-281-16/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-cleanup' into maintJunio C Hamano2017-03-281-52/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/blame-code-cleanup' into maintJunio C Hamano2017-03-281-17/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maintJunio C Hamano2017-03-281-6/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano2017-03-283-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/delta-chain-limit' into maintJunio C Hamano2017-03-281-23/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-no-index-fix' into maintJunio C Hamano2017-03-241-27/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-deadlock-regression-fix' into maintJunio C Hamano2017-03-241-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/snprintf-cleanups'Junio C Hamano2017-04-1611-96/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | gc: replace local buffer with git_pathJeff King2017-03-301-7/+1