summaryrefslogtreecommitdiff
path: root/convert.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sp/stream-clean-filter'Junio C Hamano2014-10-081-6/+49
|\
| * convert: stream from fd to required clean filter to reduce used address spaceSteffen Prohaska2014-08-281-6/+49
* | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-201-2/+1
|/
* use skip_prefix to avoid magic numbersJeff King2014-06-201-2/+2
* replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-1/+1
* typofix: in-code commentsOndřej Bílka2013-07-221-1/+1
* Merge branch 'lf/read-blob-data-from-index'Junio C Hamano2013-04-211-25/+2
|\
| * convert.c: remove duplicate codeLukas Fleischer2013-04-171-25/+2
* | convert some config callbacks to parse_config_keyJeff King2013-01-231-9/+5
|/
* Merge branch 'jb/required-filter'Junio C Hamano2012-02-281-4/+24
|\
| * Add a setting to require a filter to be successfuljb/required-filterJehan Bing2012-02-171-4/+24
| * Merge branch 'jc/maint-lf-to-crlf-keep-crlf'Junio C Hamano2011-12-221-10/+50
| |\
* | \ Merge branch 'jk/maint-avoid-streaming-filtered-contents'Junio C Hamano2012-02-261-4/+25
|\ \ \
| * | | teach dry-run convert_to_git not to require a src bufferJeff King2012-02-241-2/+10
| * | | teach convert_to_git a "dry run" modeJeff King2012-02-241-2/+15
* | | | Ignore SIGPIPE when running a filter driverjb/filter-ignore-sigpipeJehan Bing2012-02-211-0/+5
|/ / /
* | | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maintJunio C Hamano2011-12-281-10/+50
|\ \ \ | |/ / |/| / | |/
| * lf_to_crlf_filter(): resurrect CRLF->CRLF hackjc/maint-lf-to-crlf-keep-crlfJunio C Hamano2011-12-181-10/+50
* | Merge branch 'cn/maint-lf-to-crlf-filter' into maintJunio C Hamano2011-12-211-14/+40
|\ \ | |/
| * lf_to_crlf_filter(): tell the caller we added "\n" when drainingcn/maint-lf-to-crlf-filterJunio C Hamano2011-12-161-5/+7
| * convert: track state in LF-to-CRLF filterCarlos Martín Nieto2011-11-281-13/+37
* | convert.c: Fix return type of git_path_check_eol()rr/misc-fixesRamsay Jones2011-11-211-1/+1
* | convert: don't mix enum with intRamkumar Ramachandra2011-11-151-3/+3
|/
* Merge branch 'tr/maint-ident-to-git-memmove'Junio C Hamano2011-09-021-2/+2
|\
| * Use memmove in ident_to_gitThomas Rast2011-08-291-2/+2
* | Rename git_checkattr() to git_check_attr()Michael Haggerty2011-08-041-1/+1
* | streaming: filter cascadingJunio C Hamano2011-05-261-14/+112
* | streaming filter: ident filterJunio C Hamano2011-05-261-8/+169
* | Add LF-to-CRLF streaming conversionJunio C Hamano2011-05-261-0/+41
* | stream filter: add "no more input" to the filtersJunio C Hamano2011-05-261-1/+5
* | Add streaming filter APIJunio C Hamano2011-05-261-7/+77
* | convert: CRLF_INPUT is a no-op in the output codepathJunio C Hamano2011-05-201-1/+1
* | streaming_write_entry(): use streaming API in write_entry()Junio C Hamano2011-05-201-0/+23
|/
* convert: make it harder to screw up adding a conversion attributeJunio C Hamano2011-05-091-41/+38
* convert: make it safer to add conversion attributesJunio C Hamano2011-05-091-26/+22
* convert: give saner names to crlf/eol variables, types and functionsJunio C Hamano2011-05-091-30/+31
* convert: rename the "eol" global variable to "core_eol"Junio C Hamano2011-05-091-2/+2
* enums: omit trailing comma for portabilityJonathan Nieder2011-03-161-1/+1
* convert filter: supply path to external driverPete Wyckoff2010-12-221-1/+22
* Don't expand CRLFs when normalizing text during mergeEyvind Bernhardsen2010-07-021-7/+20
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-2/+14
* Merge branch 'eb/core-eol'Junio C Hamano2010-06-211-40/+110
|\
| * Add "core.eol" config variableEyvind Bernhardsen2010-06-061-24/+36
| * Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-191-8/+15
| * Add per-repository eol normalizationEyvind Bernhardsen2010-05-191-33/+84
* | Merge branch 'fg/autocrlf'Junio C Hamano2010-06-211-0/+49
|\ \ | |/
| * autocrlf: Make it work also for un-normalized repositoriesFinn Arne Gangstad2010-05-111-0/+49
* | Merge branch 'gv/portable'Junio C Hamano2010-06-211-1/+3
|\ \
| * | Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-311-1/+3
* | | convert: Keep foreign $Id$ on checkout.Henrik Grubbström2010-04-101-2/+14
View Lorry Controller Status