summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/object-id'Junio C Hamano2017-04-1946-451/+459
|\
| * Documentation: update and rename api-sha1-array.txtbrian m. carlson2017-03-311-22/+22
| * Rename sha1_array to oid_arraybrian m. carlson2017-03-3131-155/+155
| * Convert sha1_array_for_each_unique and for_each_abbrev to object_idbrian m. carlson2017-03-319-37/+35
| * Convert sha1_array_lookup to take struct object_idbrian m. carlson2017-03-317-12/+11
| * Convert remaining callers of sha1_array_lookup to object_idbrian m. carlson2017-03-313-26/+26
| * Make sha1_array_append take a struct object_id *brian m. carlson2017-03-3117-30/+32
| * sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson2017-03-2811-58/+58
| * 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-283-6/+6
| * sha1_name: convert disambiguate_hint_fn to take object_idbrian m. carlson2017-03-281-30/+34
| * sha1_name: convert struct disambiguate_state to object_idbrian m. carlson2017-03-281-11/+11
| * test-sha1-array: convert most code to struct object_idbrian m. carlson2017-03-281-5/+5
| * parse-options-cb: convert sha1_array_append caller to struct object_idbrian m. carlson2017-03-281-3/+3
| * fsck: convert init_skiplist to struct object_idbrian m. carlson2017-03-281-5/+6
| * 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-268-10/+10
| * Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson2017-03-2610-14/+14
| * Define new hash-size constants for allocating memorybrian m. carlson2017-03-261-1/+5
* | Merge branch 'sb/submodule-short-status'Junio C Hamano2017-04-195-40/+218
|\ \
| * | submodule.c: correctly handle nested submodules in is_submodule_modifiedsb/submodule-short-statusStefan Beller2017-03-294-5/+24
| * | short status: improve reporting for submodule changesStefan Beller2017-03-294-7/+156
| * | submodule.c: stricter checking for submodules in is_submodule_modifiedStefan Beller2017-03-271-2/+3
| * | submodule.c: port is_submodule_modified to use porcelain 2Stefan Beller2017-03-271-4/+5
| * | submodule.c: convert is_submodule_modified to use strbuf_getwholelineStefan Beller2017-03-272-17/+31
| * | submodule.c: factor out early loop termination in is_submodule_modifiedStefan Beller2017-03-271-8/+8
| * | submodule.c: use argv_array in is_submodule_modifiedStefan Beller2017-03-271-8/+2
* | | Twelfth batch for 2.13Junio C Hamano2017-04-161-0/+16
* | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-04-162-18/+39
|\ \ \
| * | | difftool: fix use-after-freejs/difftool-builtinJohannes Schindelin2017-04-132-2/+24
| * | | difftool: avoid strcpyJeff King2017-03-301-16/+15
* | | | Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'Junio C Hamano2017-04-161-1/+1
|\ \ \ \
| * | | | unpack-trees.c: align submodule error message to the other error messagessb/unpack-trees-would-lose-submodule-message-updateStefan Beller2017-03-291-1/+1
* | | | | Merge branch 'ab/regen-perl-mak-with-different-perl'Junio C Hamano2017-04-161-0/+1
|\ \ \ \ \
| * | | | | perl: regenerate perl.mak if perl -V changesab/regen-perl-mak-with-different-perlÆvar Arnfjörð Bjarmason2017-03-291-0/+1
* | | | | | Merge branch 'sb/show-diff-for-submodule-in-diff-fix'Junio C Hamano2017-04-162-0/+30
|\ \ \ \ \ \
| * | | | | | diff: submodule inline diff to initialize env array.sb/show-diff-for-submodule-in-diff-fixStefan Beller2017-04-022-0/+30
| |/ / / / /
* | | | | | Merge branch 'qp/bisect-docfix'Junio C Hamano2017-04-161-1/+1
|\ \ \ \ \ \
| * | | | | | git-bisect.txt: add missing wordqp/bisect-docfixQuentin Pradet2017-04-011-1/+1
* | | | | | | Merge branch 'mm/ls-files-s-doc'Junio C Hamano2017-04-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Documentation: document elements in "ls-files -s" output in ordermm/ls-files-s-docMostyn Bramley-Moore2017-04-011-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'jk/loose-object-info-report-error'Junio C Hamano2017-04-163-1/+27
|\ \ \ \ \ \ \
| * | | | | | | index-pack: detect local corruption in collision checkjk/loose-object-info-report-errorJeff King2017-04-012-0/+19
| * | | | | | | sha1_loose_object_info: return error for corrupted objectsJeff King2017-04-012-1/+8
| |/ / / / / /
* | | | | | | Merge branch 'jc/bs-t-is-not-a-tab-for-sed'Junio C Hamano2017-04-161-2/+2
|\ \ \ \ \ \ \
| * | | | | | | contrib/git-resurrect.sh: do not write \t for HT in sed scriptsjc/bs-t-is-not-a-tab-for-sedJunio C Hamano2017-03-311-2/+2
* | | | | | | | Merge branch 'jc/unused-symbols'Junio C Hamano2017-04-162-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | remote.[ch]: parse_push_cas_option() can be staticjc/unused-symbolsJunio C Hamano2017-03-312-2/+1