aboutsummaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAge
* Merge branch 'cc/apply'Junio C Hamano2016-04-13
|\
| * builtin/apply: free patch when parse_chunk() failsChristian Couder2016-04-01
| * builtin/apply: handle parse_binary() failureChristian Couder2016-04-01
| * apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-22
| * builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-22
* | apply: report patch skipping in verbose modeNguyễn Thái Ngọc Duy2016-03-24
|/
* Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-26
|\
| * use st_add and st_mult for allocation size computationJeff King2016-02-22
* | apply, ls-files: simplify "-z" parsingJeff King2016-02-01
|/
* apply: convert root string to strbufJeff King2015-10-05
* replace trivial malloc + sprintf / strcpy calls with xstrfmtJeff King2015-09-25
* Merge branch 'gb/apply-comment-typofix'Junio C Hamano2015-09-14
* Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano2015-06-24
|\
| * apply: reject a hunk that does not do anythingJunio C Hamano2015-06-01
* | Merge branch 'bc/object-id'Junio C Hamano2015-05-05
|\ \
| * | apply: convert threeway_stage to object_idbrian m. carlson2015-03-13
| * | Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-24
| |\ \
| * \ \ Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-24
| |\ \ \
* | | | | builtin/apply.c: fix a memleakStefan Beller2015-03-23
* | | | | Merge branch 'jc/apply-ws-fix-expands-report'Junio C Hamano2015-03-03
|\ \ \ \ \
| * | | | | apply: detect and mark whitespace errors in context lines when fixingJunio C Hamano2015-01-22
| | |_|/ / | |/| | |
* | | | | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-03
|\ \ \ \ \
| * | | | | apply: do not touch a file beyond a symbolic linkJunio C Hamano2015-02-10
| * | | | | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-10
| * | | | | apply: do not read from the filesystem under --indexJunio C Hamano2015-02-10
| * | | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-10
* | | | | | Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano2015-02-17
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | apply: count the size of postimage correctlyJunio C Hamano2015-01-22
| * | | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-22
| * | | | | apply.c: typofixJunio C Hamano2015-01-22
* | | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-02-11
|\ \ \ \ \ \
| * | | | | | standardize usage info string formatAlex Henrie2015-01-14
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-11
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King2015-01-13
* | | | | Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano2014-12-22
|\ \ \ \ \
| * | | | | sort_string_list(): rename to string_list_sort()Michael Haggerty2014-11-25
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sv/typofix-apply-error-message'Junio C Hamano2014-12-12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | apply: fix typo in an error messageSlavomir Vlcek2014-11-17
| | |_|/ | |/| |
* | | | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-10-14
|\ \ \ \
| * | | | use skip_prefix() to avoid more magic numbersRené Scharfe2014-10-07
| | |/ / | |/| |
* | | | lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
|/ / /
* | | use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe2014-09-18
* | | Merge branch 'ta/config-set-2'Junio C Hamano2014-09-11
|\ \ \
| * | | builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`Tanay Abhra2014-08-13
* | | | Merge branch 'jc/apply-ws-prefix'Junio C Hamano2014-09-09
|\ \ \ \
| * | | | apply: omit ws check for excluded pathsJunio C Hamano2014-08-07
| * | | | apply: hoist use_patch() helper for path exclusion upJunio C Hamano2014-08-07
| * | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-07
* | | | | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-28
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | apply: avoid possible bogus pointerJeff King2014-07-24