Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/misc-cppcheck-fixes' | Junio C Hamano | 2017-04-23 | 1 | -2/+6 |
|\ | |||||
| * | am: close stream on error, but not stdin | René Scharfe | 2017-04-16 | 1 | -2/+6 |
* | | Merge branch 'jk/snprintf-cleanups' | Junio C Hamano | 2017-04-23 | 1 | -0/+1 |
|\ \ | |||||
| * | | replace: plug a memory leakjk/snprintf-cleanups | Junio C Hamano | 2017-04-17 | 1 | -0/+1 |
* | | | Merge branch 'jk/quarantine-received-objects' | Junio C Hamano | 2017-04-23 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | receive-pack: drop tmp_objdir_env from run_update_hook | Jeff King | 2017-04-16 | 1 | -1/+0 |
* | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck' | Junio C Hamano | 2017-04-23 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | read-cache: force_verify_index_checksum | Jeff Hostetler | 2017-04-15 | 1 | -0/+1 |
* | | | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-04-23 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | path.c: and an option to call real_path() in expand_user_path() | Nguyễn Thái Ngọc Duy | 2017-04-14 | 2 | -2/+2 |
* | | | | | | Merge branch 'ab/grep-plug-pathspec-leak' | Junio C Hamano | 2017-04-19 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | grep: plug a trivial memory leakab/grep-plug-pathspec-leak | Ævar Arnfjörð Bjarmason | 2017-04-16 | 1 | -0/+1 |
* | | | | | | | Merge branch 'nd/files-backend-git-dir' | Junio C Hamano | 2017-04-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | refs: delete pack_refs() in favor of refs_pack_refs() | Nguyễn Thái Ngọc Duy | 2017-04-14 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'bw/submodule-is-active' | Junio C Hamano | 2017-04-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule--helper: fix typo in is_active error messagebw/submodule-is-active | Stefan Beller | 2017-04-13 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' | Junio C Hamano | 2017-04-19 | 2 | -2/+48 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodule--helper: add push-check subcommand | Brandon Williams | 2017-04-11 | 1 | -0/+45 |
| * | | | | | | | | | push: unmark a local variable as static | Brandon Williams | 2017-04-02 | 1 | -2/+3 |
* | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-04-19 | 14 | -169/+169 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Rename sha1_array to oid_array | brian m. carlson | 2017-03-31 | 7 | -31/+31 |
| * | | | | | | | | | | Convert sha1_array_for_each_unique and for_each_abbrev to object_id | brian m. carlson | 2017-03-31 | 3 | -10/+10 |
| * | | | | | | | | | | Convert sha1_array_lookup to take struct object_id | brian m. carlson | 2017-03-31 | 1 | -1/+1 |
| * | | | | | | | | | | Convert remaining callers of sha1_array_lookup to object_id | brian m. carlson | 2017-03-31 | 1 | -8/+8 |
| * | | | | | | | | | | Make sha1_array_append take a struct object_id * | brian m. carlson | 2017-03-31 | 5 | -9/+9 |
| * | | | | | | | | | | sha1-array: convert internal storage for struct sha1_array to object_id | brian m. carlson | 2017-03-28 | 2 | -13/+13 |
| * | | | | | | | | | | builtin/pull: convert to struct object_id | brian m. carlson | 2017-03-28 | 1 | -36/+36 |
| * | | | | | | | | | | submodule: convert check_for_new_submodule_commits to object_id | brian m. carlson | 2017-03-28 | 1 | -3/+3 |
| * | | | | | | | | | | builtin/receive-pack: convert portions to struct object_id | brian m. carlson | 2017-03-28 | 1 | -49/+49 |
| * | | | | | | | | | | builtin/pull: convert portions to struct object_id | brian m. carlson | 2017-03-26 | 1 | -3/+3 |
| * | | | | | | | | | | builtin/diff: convert to struct object_id | brian m. carlson | 2017-03-26 | 1 | -17/+17 |
| * | | | | | | | | | | Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ | brian m. carlson | 2017-03-26 | 2 | -2/+2 |
| * | | | | | | | | | | Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ | brian m. carlson | 2017-03-26 | 4 | -5/+5 |
* | | | | | | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-04-16 | 1 | -18/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | difftool: fix use-after-freejs/difftool-builtin | Johannes Schindelin | 2017-04-13 | 1 | -2/+5 |
| * | | | | | | | | | | | difftool: avoid strcpy | Jeff King | 2017-03-30 | 1 | -16/+15 |
* | | | | | | | | | | | | Merge branch 'jk/loose-object-info-report-error' | Junio C Hamano | 2017-04-16 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | index-pack: detect local corruption in collision checkjk/loose-object-info-report-error | Jeff King | 2017-04-01 | 1 | -0/+2 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'rs/update-hook-optim' into maint | Junio C Hamano | 2017-03-28 | 1 | -8/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/shortlog-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-name-cleanups' into maint | Junio C Hamano | 2017-03-28 | 1 | -16/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-parse-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -52/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/blame-code-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -17/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint | Junio C Hamano | 2017-03-28 | 1 | -6/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/interpret-branch-name' into maint | Junio C Hamano | 2017-03-28 | 3 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/delta-chain-limit' into maint | Junio C Hamano | 2017-03-28 | 1 | -23/+110 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-no-index-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -27/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-deadlock-regression-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/snprintf-cleanups' | Junio C Hamano | 2017-04-16 | 11 | -96/+99 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | gc: replace local buffer with git_path | Jeff King | 2017-03-30 | 1 | -7/+1 |