summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* load_subtree(): check that `prefix_len` is in the expected rangemh/notes-cleanupMichael Haggerty2017-09-091-1/+4
* load_subtree(): declare some variables to be `size_t`Michael Haggerty2017-08-261-3/+3
* hex_to_bytes(): simpler replacement for `get_oid_hex_segment()`Michael Haggerty2017-08-261-18/+10
* get_oid_hex_segment(): don't pad the rest of `oid`Michael Haggerty2017-08-261-11/+13
* load_subtree(): combine some common codeMichael Haggerty2017-08-261-9/+5
* get_oid_hex_segment(): return 0 on successMichael Haggerty2017-08-261-8/+7
* load_subtree(): only consider blobs to be potential notesMichael Haggerty2017-08-261-0/+5
* load_subtree(): check earlier whether an internal node is a tree entryMichael Haggerty2017-08-261-2/+5
* load_subtree(): separate logic for internal vs. terminal entriesMichael Haggerty2017-08-261-21/+31
* load_subtree(): fix incorrect commentMichael Haggerty2017-08-261-17/+7
* load_subtree(): reduce the scope of some local variablesMichael Haggerty2017-08-261-4/+4
* load_subtree(): remove unnecessary conditionalMichael Haggerty2017-08-261-18/+17
* notes: make GET_NIBBLE macro more robustMichael Haggerty2017-08-261-1/+1
* Prepare for 2.14.2Junio C Hamano2017-08-233-2/+37
* Merge branch 'jt/t1450-fsck-corrupt-packfile' into maintJunio C Hamano2017-08-231-0/+16
|\
| * tests: ensure fsck fails on corrupt packfilesjt/t1450-fsck-corrupt-packfileJonathan Tan2017-07-281-0/+16
* | Merge branch 'jb/t8008-cleanup' into maintJunio C Hamano2017-08-231-14/+16
|\ \
| * | t8008: rely on rev-parse'd HEAD instead of sha1 valuejb/t8008-cleanupStefan Beller2017-07-261-14/+16
| |/
* | Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-2314-285/+802
|\ \
| * | sub-process: refactor handshake to common functionjt/subprocess-handshakeJonathan Tan2017-07-266-90/+138
| * | Documentation: migrate sub-process docs to headerJonathan Tan2017-07-262-61/+23
| * | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-269-161/+668
| |\ \ | | |/ | |/|
| | * convert: add "status=delayed" to filter process protocolLars Schneider2017-06-309-90/+575
| | * convert: refactor capabilities negotiationLars Schneider2017-06-301-12/+27
| | * convert: move multiple file filter error handling to separate functionLars Schneider2017-06-291-21/+26
| | * convert: put the flags field before the flag itself for consistent styleLars Schneider2017-06-291-5/+5
| | * t0021: write "OUT <size>" only on successLars Schneider2017-06-292-6/+6
| | * t0021: make debug log file name configurableLars Schneider2017-06-262-25/+27
| | * t0021: keep filter log files on comparisonLars Schneider2017-06-261-6/+6
* | | Merge branch 'dc/fmt-merge-msg-microcleanup' into maintJunio C Hamano2017-08-231-1/+2
|\ \ \
| * | | fmt-merge-msg: fix coding styledc/fmt-merge-msg-microcleanupDimitrios Christidis2017-07-251-1/+2
* | | | Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano2017-08-232-13/+15
|\ \ \ \
| * | | | doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlightAndreas Heiduk2017-07-252-13/+15
| |/ / /
* | | | Merge branch 'cc/ref-is-hidden-microcleanup' into maintJunio C Hamano2017-08-231-5/+4
|\ \ \ \
| * | | | refs: use skip_prefix() in ref_is_hidden()cc/ref-is-hidden-microcleanupChristian Couder2017-07-241-5/+4
| |/ / /
* | | | Merge branch 'js/run-process-parallel-api-fix' into maintJunio C Hamano2017-08-232-3/+3
|\ \ \ \
| * | | | run_processes_parallel: change confusing task_cb conventionjs/run-process-parallel-api-fixJohannes Schindelin2017-07-212-3/+3
* | | | | Merge branch 'rs/pack-objects-pbase-cleanup' into maintJunio C Hamano2017-08-231-1/+1
|\ \ \ \ \
| * | | | | pack-objects: remove unnecessary NULL checkrs/pack-objects-pbase-cleanupRené Scharfe2017-07-201-1/+1
* | | | | | Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2017-08-233-27/+17
|\ \ \ \ \ \
| * | | | | | fsck: cleanup unused variableJonathan Tan2017-07-261-3/+1
| * | | | | | object: remove "used" field from struct objectJonathan Tan2017-07-203-12/+15
| * | | | | | fsck: remove redundant parse_tree() invocationJonathan Tan2017-07-201-12/+1
* | | | | | | Merge branch 'rs/stat-data-unaligned-reads-fix' into maintJunio C Hamano2017-08-231-23/+27
|\ \ \ \ \ \ \
| * | | | | | | dir: support platforms that require aligned readsrs/stat-data-unaligned-reads-fixRené Scharfe2017-07-171-23/+27
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rs/move-array' into maintJunio C Hamano2017-08-2311-30/+44
|\ \ \ \ \ \ \
| * | | | | | | ls-files: don't try to prune an empty indexrs/move-arrayRené Scharfe2017-07-171-1/+1
| * | | | | | | apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe2017-07-171-7/+4
| * | | | | | | use MOVE_ARRAYRené Scharfe2017-07-179-26/+17
| * | | | | | | add MOVE_ARRAYRené Scharfe2017-07-172-0/+25
View Lorry Controller Status