summaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAgeFilesLines
* apply: move lockfile into `apply_state`Martin Ågren2017-10-061-3/+1
* apply: refactor `git apply` option parsingChristian Couder2016-09-071-71/+3
* apply: make it possible to silently applyChristian Couder2016-09-071-1/+1
* apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder2016-09-071-4732/+1
* apply: rename and move opt constants to apply.hChristian Couder2016-09-071-7/+4
* builtin/apply: rename option parsing functionsChristian Couder2016-09-071-20/+20
* builtin/apply: make create_one_file() return -1 on errorChristian Couder2016-09-071-15/+21
* builtin/apply: make try_create_file() return -1 on errorChristian Couder2016-09-071-11/+33
* builtin/apply: make write_out_results() return -1 on errorChristian Couder2016-08-111-6/+21
* builtin/apply: make write_out_one_result() return -1 on errorChristian Couder2016-08-111-22/+16
* builtin/apply: make create_file() return -1 on errorChristian Couder2016-08-111-12/+13
* builtin/apply: make add_index_file() return -1 on errorChristian Couder2016-08-111-17/+31
* builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder2016-08-111-7/+13
* builtin/apply: make remove_file() return -1 on errorChristian Couder2016-08-111-6/+11
* builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder2016-08-111-15/+26
* builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder2016-08-111-11/+21
* builtin/apply: make gitdiff_*() return -1 on errorChristian Couder2016-08-111-19/+21
* builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder2016-08-111-3/+9
* builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder2016-08-111-6/+9
* builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder2016-08-111-11/+26
* builtin/apply: move check_apply_state() to apply.cChristian Couder2016-08-111-32/+0
* builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder2016-08-111-8/+11
* apply: make init_apply_state() return -1 instead of exit()ingChristian Couder2016-08-111-1/+2
* builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-111-91/+0
* builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die(...Christian Couder2016-08-111-7/+7
* builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder2016-08-111-11/+12
* builtin/apply: make parse_single_patch() return -1 on errorChristian Couder2016-08-111-4/+13
* builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder2016-08-111-8/+14
* builtin/apply: make find_header() return -128 instead of die()ingChristian Couder2016-08-111-12/+28
* builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder2016-08-111-3/+5
* builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder2016-08-111-15/+45
* apply: move 'struct apply_state' to apply.hChristian Couder2016-08-111-97/+1
* apply: make some names more specificChristian Couder2016-08-111-10/+10
* Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-3/+3
|\
| * i18n: standardise messagesVasco Almeida2016-06-171-3/+3
* | Merge branch 'jk/string-list-static-init'Junio C Hamano2016-07-061-0/+3
|\ \
| * | use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-131-3/+3
| |/
* | Merge branch 'cc/apply-introduce-state'Junio C Hamano2016-06-271-609/+820
|\ \
| * | builtin/apply: remove misleading comment on lock_file fieldcc/apply-introduce-stateJunio C Hamano2016-06-061-4/+1
| * | builtin/apply: move 'newfd' global into 'struct apply_state'Christian Couder2016-06-031-4/+5
| * | builtin/apply: add 'lock_file' pointer into 'struct apply_state'Christian Couder2016-06-031-4/+15
| * | builtin/apply: move applying patches into apply_all_patches()Christian Couder2016-06-011-58/+71
| * | builtin/apply: move 'state' check into check_apply_state()Christian Couder2016-06-011-23/+29
| * | builtin/apply: move 'symlink_changes' global into 'struct apply_state'Christian Couder2016-06-011-22/+28
| * | builtin/apply: move 'fn_table' global into 'struct apply_state'Christian Couder2016-06-011-22/+25
| * | builtin/apply: move 'state_linenr' global into 'struct apply_state'Christian Couder2016-06-011-35/+36
| * | builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'Christian Couder2016-06-011-24/+25
| * | builtin/apply: move 'ws_ignore_action' into 'struct apply_state'Christian Couder2016-06-011-17/+20
| * | builtin/apply: move 'ws_error_action' into 'struct apply_state'Christian Couder2016-06-011-28/+33
| * | builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'Christian Couder2016-06-011-5/+5
View Lorry Controller Status