summaryrefslogtreecommitdiff
path: root/convert.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jh/resize-convert-scratch-buffer'Junio C Hamano2019-04-101-1/+1
|\
| * convert: avoid malloc of original file sizeJoey Hess2019-03-081-1/+1
* | Merge branch 'jk/unused-parameter-cleanup'Junio C Hamano2019-02-061-14/+14
|\ \
| * | convert: drop path parameter from actual conversion functionsJeff King2019-01-241-7/+7
| * | convert: drop len parameter from conversion checksJeff King2019-01-241-7/+7
* | | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-1/+0
|\ \ \ | |/ / |/| |
| * | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-1/+0
| |/
* | Merge branch 'nd/style-opening-brace'Junio C Hamano2019-01-181-1/+2
|\ \
| * | style: the opening '{' of a function is in a separate lineNguyễn Thái Ngọc Duy2018-12-101-1/+2
| |/
* | Indent code with TABsNguyễn Thái Ngọc Duy2018-12-091-3/+3
|/
* Make git_check_attr() a void functionTorsten Bögershausen2018-09-121-23/+19
* Merge branch 'nd/no-the-index'Junio C Hamano2018-08-201-17/+24
|\
| * convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-17/+24
| * attr: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-1/+1
* | Merge branch 'jk/size-t'Junio C Hamano2018-08-151-3/+3
|\ \
| * | reencode_string: use size_t for string lengthsJeff King2018-07-241-3/+3
* | | Merge branch 'nd/i18n'Junio C Hamano2018-08-151-20/+22
|\ \ \ | |_|/ |/| |
| * | convert.c: mark more strings for translationNguyễn Thái Ngọc Duy2018-07-231-18/+20
| * | Update messages in preparation for i18nNguyễn Thái Ngọc Duy2018-07-231-3/+3
| |/
* | Merge branch 'bb/pedantic'Junio C Hamano2018-07-241-1/+1
|\ \
| * | convert.c: replace "\e" escapes with "\033".Beat Bolli2018-07-091-1/+1
| |/
* | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\ \ | |/ |/|
| * object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | Merge branch 'ls/checkout-encoding'Junio C Hamano2018-05-081-1/+275
|\ \ | |/ |/|
| * convert: add round trip check based on 'core.checkRoundtripEncoding'Lars Schneider2018-04-161-0/+77
| * convert: add tracing for 'working-tree-encoding' attributeLars Schneider2018-04-161-0/+25
| * convert: check for detectable errors in UTF encodingsLars Schneider2018-04-161-0/+61
| * convert: add 'working-tree-encoding' attributeLars Schneider2018-04-161-1/+112
* | convert: convert to struct object_idbc/object-idbrian m. carlson2018-03-141-6/+6
* | Merge branch 'po/object-id'Junio C Hamano2018-02-151-3/+3
|\ \ | |/ |/|
| * sha1_file: convert hash_sha1_file to object_idPatryk Obara2018-01-301-3/+3
* | convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flagsTorsten Bögershausen2018-01-161-19/+19
|/
* Merge branch 'tb/check-crlf-for-safe-crlf'Junio C Hamano2017-12-271-5/+14
|\
| * convert: tighten the safe autocrlf handlingTorsten Bögershausen2017-11-271-5/+14
| * Merge branch 'ma/ts-cleanups' into maintJunio C Hamano2017-10-231-2/+3
| |\
| * \ Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano2017-09-101-4/+6
| |\ \
* | | | consistently use "fallthrough" comments in switchesjk/fallthroughJeff King2017-09-221-1/+2
* | | | Merge branch 'rs/strbuf-leakfix'Junio C Hamano2017-09-191-1/+3
|\ \ \ \
| * | | | convert: release strbuf on error return in filter_buffer_or_fd()Rene Scharfe2017-09-071-1/+3
* | | | | Merge branch 'ma/ts-cleanups'Junio C Hamano2017-09-101-2/+3
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | convert: always initialize attr_action in convert_attrsMartin Ågren2017-08-231-2/+3
* | | | Merge branch 'tb/apply-with-crlf'Junio C Hamano2017-08-261-4/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | convert: add SAFE_CRLF_KEEP_CRLFTorsten Bögershausen2017-08-161-4/+6
| |/ /
* | | Merge branch 'jt/subprocess-handshake'Junio C Hamano2017-08-111-68/+7
|\ \ \ | | |/ | |/|
| * | sub-process: refactor handshake to common functionjt/subprocess-handshakeJonathan Tan2017-07-261-68/+7
| * | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-261-52/+150
| |\ \ | | |/ | |/|
* | | Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-111-2/+1
|\ \ \
| * | | convert/sub-process: drop cast to hashmap_cmp_fnStefan Beller2017-07-051-2/+1
| |/ /
* | | Merge branch 'ls/filter-process-delayed'Junio C Hamano2017-08-111-52/+150
|\ \ \ | |/ / |/| / | |/
| * convert: add "status=delayed" to filter process protocolLars Schneider2017-06-301-16/+94
View Lorry Controller Status