aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/apply.c
AgeCommit message (Expand)AuthorFilesLines
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+0
2023-04-24hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2022-04-06apply.c: remove unnecessary includeGarrit Franke1-1/+0
2018-08-13apply.c: make init_apply_state() take a struct repositoryNguyễn Thái Ngọc Duy1-1/+1
2017-10-06apply: move lockfile into `apply_state`Martin Ågren1-3/+1
2016-09-07apply: refactor `git apply` option parsingChristian Couder1-71/+3
2016-09-07apply: make it possible to silently applyChristian Couder1-1/+1
2016-09-07apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder1-4732/+1
2016-09-07apply: rename and move opt constants to apply.hChristian Couder1-7/+4
2016-09-07builtin/apply: rename option parsing functionsChristian Couder1-20/+20
2016-09-07builtin/apply: make create_one_file() return -1 on errorChristian Couder1-15/+21
2016-09-07builtin/apply: make try_create_file() return -1 on errorChristian Couder1-11/+33
2016-08-11builtin/apply: make write_out_results() return -1 on errorChristian Couder1-6/+21
2016-08-11builtin/apply: make write_out_one_result() return -1 on errorChristian Couder1-22/+16
2016-08-11builtin/apply: make create_file() return -1 on errorChristian Couder1-12/+13
2016-08-11builtin/apply: make add_index_file() return -1 on errorChristian Couder1-17/+31
2016-08-11builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder1-7/+13
2016-08-11builtin/apply: make remove_file() return -1 on errorChristian Couder1-6/+11
2016-08-11builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder1-15/+26
2016-08-11builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder1-11/+21
2016-08-11builtin/apply: make gitdiff_*() return -1 on errorChristian Couder1-19/+21
2016-08-11builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder1-3/+9
2016-08-11builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder1-6/+9
2016-08-11builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder1-11/+26
2016-08-11builtin/apply: move check_apply_state() to apply.cChristian Couder1-32/+0
2016-08-11builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder1-8/+11
2016-08-11apply: make init_apply_state() return -1 instead of exit()ingChristian Couder1-1/+2
2016-08-11builtin/apply: move init_apply_state() to apply.cChristian Couder1-91/+0
2016-08-11builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die(...Christian Couder1-7/+7
2016-08-11builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder1-11/+12
2016-08-11builtin/apply: make parse_single_patch() return -1 on errorChristian Couder1-4/+13
2016-08-11builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder1-8/+14
2016-08-11builtin/apply: make find_header() return -128 instead of die()ingChristian Couder1-12/+28
2016-08-11builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder1-3/+5
2016-08-11builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder1-15/+45
2016-08-11apply: move 'struct apply_state' to apply.hChristian Couder1-97/+1
2016-08-11apply: make some names more specificChristian Couder1-10/+10
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano1-3/+3
2016-07-06Merge branch 'jk/string-list-static-init'Junio C Hamano1-0/+3
2016-06-27Merge branch 'cc/apply-introduce-state'Junio C Hamano1-609/+820
2016-06-17i18n: standardise messagesVasco Almeida1-3/+3
2016-06-13use string_list initializer consistentlyJeff King1-3/+3
2016-06-06builtin/apply: remove misleading comment on lock_file fieldJunio C Hamano1-4/+1
2016-06-03Merge branch 'rs/apply-name-terminate'Junio C Hamano1-2/+2
2016-06-03builtin/apply: move 'newfd' global into 'struct apply_state'Christian Couder1-4/+5
2016-06-03builtin/apply: add 'lock_file' pointer into 'struct apply_state'Christian Couder1-4/+15
2016-06-01builtin/apply: move applying patches into apply_all_patches()Christian Couder1-58/+71
2016-06-01builtin/apply: move 'state' check into check_apply_state()Christian Couder1-23/+29
2016-06-01builtin/apply: move 'symlink_changes' global into 'struct apply_state'Christian Couder1-22/+28
2016-06-01builtin/apply: move 'fn_table' global into 'struct apply_state'Christian Couder1-22/+25
2016-06-01builtin/apply: move 'state_linenr' global into 'struct apply_state'Christian Couder1-35/+36
2016-06-01builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'Christian Couder1-24/+25
2016-06-01builtin/apply: move 'ws_ignore_action' into 'struct apply_state'Christian Couder1-17/+20
2016-06-01builtin/apply: move 'ws_error_action' into 'struct apply_state'Christian Couder1-28/+33
2016-06-01builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'Christian Couder1-5/+5
2016-06-01builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'Christian Couder1-11/+11
2016-06-01builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()Christian Couder1-5/+4
2016-06-01builtin/apply: move 'whitespace_option' into 'struct apply_state'Christian Couder1-7/+6
2016-06-01builtin/apply: move 'whitespace_error' global into 'struct apply_state'Christian Couder1-13/+15
2016-06-01builtin/apply: move 'root' global into 'struct apply_state'Christian Couder1-33/+49
2016-06-01builtin/apply: move 'p_value_known' global into 'struct apply_state'Christian Couder1-5/+4
2016-06-01builtin/apply: move 'p_value' global into 'struct apply_state'Christian Couder1-52/+99
2016-06-01builtin/apply: move 'has_include' global into 'struct apply_state'Christian Couder1-3/+3
2016-06-01builtin/apply: move 'limit_by_name' global into 'struct apply_state'Christian Couder1-10/+16
2016-06-01builtin/apply: move 'patch_input_file' global into 'struct apply_state'Christian Couder1-10/+17
2016-06-01builtin/apply: move 'apply' global into 'struct apply_state'Christian Couder1-14/+17
2016-06-01builtin/apply: move 'p_context' global into 'struct apply_state'Christian Couder1-3/+4
2016-06-01builtin/apply: move 'fake_ancestor' global into 'struct apply_state'Christian Couder1-8/+5
2016-06-01builtin/apply: move 'line_termination' global into 'struct apply_state'Christian Couder1-5/+9
2016-06-01builtin/apply: move 'unsafe_paths' global into 'struct apply_state'Christian Couder1-4/+4
2016-06-01builtin/apply: move 'no_add' global into 'struct apply_state'Christian Couder1-3/+3
2016-06-01builtin/apply: move 'threeway' global into 'struct apply_state'Christian Couder1-7/+7
2016-06-01builtin/apply: move 'summary' global into 'struct apply_state'Christian Couder1-4/+4
2016-06-01builtin/apply: move 'numstat' global into 'struct apply_state'Christian Couder1-5/+4
2016-06-01builtin/apply: move 'diffstat' global into 'struct apply_state'Christian Couder1-5/+6
2016-06-01builtin/apply: move 'cached' global into 'struct apply_state'Christian Couder1-16/+19
2016-06-01builtin/apply: move 'allow_overlap' global into 'struct apply_state'Christian Couder1-5/+6
2016-06-01builtin/apply: move 'update_index' global into 'struct apply_state'Christian Couder1-19/+26
2016-06-01builtin/apply: move 'apply_verbosely' global into 'struct apply_state'Christian Couder1-13/+13
2016-06-01builtin/apply: move 'apply_with_reject' global into 'struct apply_state'Christian Couder1-7/+7
2016-06-01builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'Christian Couder1-19/+31
2016-06-01builtin/apply: move 'check_index' global into 'struct apply_state'Christian Couder1-29/+37
2016-06-01builtin/apply: move 'check' global into 'struct apply_state'Christian Couder1-7/+7
2016-06-01builtin/apply: move 'unidiff_zero' global into 'struct apply_state'Christian Couder1-18/+25
2016-06-01builtin/apply: move 'state' init into init_apply_state()Christian Couder1-10/+22
2016-05-29apply: remove unused parameters from name_terminate()René Scharfe1-2/+2
2016-05-12builtin/apply: introduce 'struct apply_state' to start libifyingChristian Couder1-38/+56
2016-05-12builtin/apply: move 'read_stdin' global into cmd_apply()Christian Couder1-1/+1
2016-05-12builtin/apply: move 'options' variable into cmd_apply()Christian Couder1-1/+1
2016-05-12builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()Christian Couder1-55/+71
2016-05-12builtin/apply: avoid local variable shadowing 'len' parameterChristian Couder1-10/+10
2016-05-12builtin/apply: avoid parameter shadowing 'linenr' globalChristian Couder1-24/+24
2016-05-12builtin/apply: avoid parameter shadowing 'p_value' globalChristian Couder1-17/+17
2016-05-12builtin/apply: make gitdiff_verify_name() return voidChristian Couder1-13/+13
2016-04-13Merge branch 'cc/apply'Junio C Hamano1-15/+15
2016-04-01builtin/apply: free patch when parse_chunk() failsChristian Couder1-1/+3
2016-04-01builtin/apply: handle parse_binary() failureChristian Couder1-0/+7
2016-03-24apply: report patch skipping in verbose modeNguyễn Thái Ngọc Duy1-0/+2
2016-03-22apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano1-6/+0
2016-03-22builtin/apply: get rid of useless 'name' variableChristian Couder1-8/+5
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano1-1/+1
2016-02-22use st_add and st_mult for allocation size computationJeff King1-1/+1
2016-02-01apply, ls-files: simplify "-z" parsingJeff King1-13/+3
2015-10-05apply: convert root string to strbufJeff King1-16/+10
2015-09-25replace trivial malloc + sprintf / strcpy calls with xstrfmtJeff King1-4/+1
2015-09-14Merge branch 'gb/apply-comment-typofix'Junio C Hamano1-1/+1
2015-06-24Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano1-0/+3
2015-06-01apply: reject a hunk that does not do anythingJunio C Hamano1-0/+3
2015-05-05Merge branch 'bc/object-id'Junio C Hamano1-7/+7
2015-03-23builtin/apply.c: fix a memleakStefan Beller1-1/+3
2015-03-13apply: convert threeway_stage to object_idbrian m. carlson1-7/+7
2015-03-03Merge branch 'jc/apply-ws-fix-expands-report'Junio C Hamano1-0/+3
2015-03-03Merge branch 'jc/apply-beyond-symlink'Junio C Hamano1-1/+141
2015-02-24Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano1-3/+28
2015-02-24Merge branch 'jk/blame-commit-label' into maintJunio C Hamano1-10/+5
2015-02-17Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano1-3/+28
2015-02-11Merge branch 'ah/usage-strings'Junio C Hamano1-1/+1
2015-02-11Merge branch 'jk/blame-commit-label'Junio C Hamano1-10/+5
2015-02-10apply: do not touch a file beyond a symbolic linkJunio C Hamano1-0/+112
2015-02-10apply: do not read from beyond a symbolic linkJunio C Hamano1-0/+2
2015-02-10apply: do not read from the filesystem under --indexJunio C Hamano1-1/+1
2015-02-10apply: reject input that touches outside the working areaJunio C Hamano1-0/+26
2015-01-22apply: detect and mark whitespace errors in context lines when fixingJunio C Hamano1-0/+3
2015-01-22apply: count the size of postimage correctlyJunio C Hamano1-2/+21
2015-01-22apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano1-0/+6
2015-01-22apply.c: typofixJunio C Hamano1-1/+1
2015-01-14standardize usage info string formatAlex Henrie1-1/+1
2015-01-13builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King1-10/+5
2014-12-22Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano1-1/+1
2014-12-12Merge branch 'sv/typofix-apply-error-message'Junio C Hamano1-1/+1
2014-11-25sort_string_list(): rename to string_list_sort()Michael Haggerty1-1/+1
2014-11-17apply: fix typo in an error messageSlavomir Vlcek1-1/+1
2014-10-14Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano1-1/+1
2014-10-07use skip_prefix() to avoid more magic numbersRené Scharfe1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-09-18use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe1-1/+1
2014-09-11Merge branch 'ta/config-set-2'Junio C Hamano1-7/+5
2014-09-09Merge branch 'jc/apply-ws-prefix'Junio C Hamano1-63/+68
2014-08-13builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`Tanay Abhra1-7/+5
2014-08-07apply: omit ws check for excluded pathsJunio C Hamano1-3/+6
2014-08-07apply: hoist use_patch() helper for path exclusion upJunio C Hamano1-38/+43
2014-08-07apply: use the right attribute for paths in non-Git patchesJunio C Hamano1-22/+19
2014-07-28Merge branch 'jk/misc-fixes-maint'Junio C Hamano1-1/+1
2014-07-24apply: avoid possible bogus pointerJeff King1-1/+1
2014-07-21Merge branch 'maint'Junio C Hamano1-3/+1
2014-07-21use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe1-3/+1
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-8/+9
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano1-3/+1
2014-06-25Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano1-5/+7
2014-06-20apply: use skip_prefix instead of raw additionJeff King1-2/+3
2014-06-19use xstrfmt to replace xmalloc + strcpy/strcatJeff King1-3/+1
2014-06-13entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy1-3/+5
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-5/+4
2014-06-03Merge branch 'jc/apply-ignore-whitespace'Junio C Hamano1-5/+7
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano1-1/+1
2014-03-31comments: fix misuses of "nor"Justin Lebar1-1/+1
2014-03-26apply --ignore-space-change: lines with and without leading whitespaces do no...Junio C Hamano1-5/+7
2014-03-14Merge branch 'nd/no-more-fnmatch'Junio C Hamano1-1/+1
2014-02-27Merge branch 'ep/varscope'Junio C Hamano1-6/+6
2014-02-20use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy1-1/+1
2014-01-31builtin/apply.c: reduce scope of variablesElia Pinto1-6/+6
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-6/+6
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller1-12/+12
2013-07-22Sync with Git 1.8.3.4Junio C Hamano1-1/+1
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano1-6/+7
2013-07-22Merge branch 'tr/do-not-call-submodules-subprojects'Junio C Hamano1-1/+1
2013-07-22update URL to the marc.info mail archiveOndřej Bílka1-1/+1
2013-07-19apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller1-1/+1
2013-07-19Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano1-1/+1
2013-07-18apply, entry: speak of submodules instead of subprojectsThomas Rast1-1/+1
2013-07-15Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano1-1/+1
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-6/+7
2013-06-26Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano1-1/+1
2013-06-21apply: carefully strdup a possibly-NULL nameThomas Rast1-1/+1
2013-06-13use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe1-1/+1
2013-04-12Sync with 'maint'Junio C Hamano1-3/+3
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini1-3/+3
2013-04-03Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano1-6/+10
2013-03-22apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano1-6/+10
2013-02-14Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano1-2/+38
2013-02-08Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano1-4/+6
2013-02-05Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano1-14/+16
2013-02-05apply: verify submodule commit object name betterJunio C Hamano1-2/+38
2013-02-03builtin/apply: tighten (dis)similarity index parsingJohn Keeping1-4/+6
2013-01-31apply: diagnose incomplete submodule object name betterJunio C Hamano1-1/+5
2013-01-31apply: simplify build_fake_ancestor()Junio C Hamano1-14/+12
2013-01-06Merge branch 'jc/apply-trailing-blank-removal'Junio C Hamano1-6/+17
2012-10-12apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano1-6/+17
2012-09-12Merge branch 'maint-1.7.11' into maintJunio C Hamano1-25/+43
2012-09-12Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano1-25/+43
2012-09-11Sync with 1.7.11.6Junio C Hamano1-1/+0
2012-09-11Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano1-1/+0
2012-09-07Merge branch 'jc/apply-binary-p0'Junio C Hamano1-25/+43
2012-09-07Merge branch 'nd/i18n-parseopt-help'Junio C Hamano1-1/+1
2012-08-24apply: compute patch->def_name correctly under -p0Junio C Hamano1-25/+43
2012-08-22Use imperative form in help usage to describe an actionNguyễn Thái Ngọc Duy1-1/+1
2012-08-22Merge branch 'pg/maint-apply-remove-unused-variable'Junio C Hamano1-1/+0
2012-08-05apply: delete unused deflate_origlen from patch structPaul Gortmaker1-1/+0
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 15:18:45 +0000