aboutsummaryrefslogtreecommitdiffstats
path: root/apply.c
AgeCommit message (Expand)AuthorFilesLines
4 daysMerge branch 'rj/add-i-leak-fix'HEADmastermainJunio C Hamano1-1/+3
6 daysapply: plug a leak in apply_dataRubén Justo1-1/+3
13 daysapply: avoid using fixed-size buffer in write_out_one_reject()René Scharfe1-16/+17
14 daysMerge branch 'rs/apply-reject-fd-leakfix'Junio C Hamano1-2/+5
14 daysMerge branch 'rs/apply-lift-path-length-limit'Junio C Hamano1-6/+9
2024-04-09Merge branch 'jc/apply-parse-diff-git-header-names-fix'Junio C Hamano1-1/+8
2024-04-05apply: don't leak fd on fdopen() errorRené Scharfe1-2/+5
2024-04-05apply: avoid fixed-size buffer in create_one_file()René Scharfe1-6/+9
2024-03-19apply: parse names out of "diff --git" more carefullyJunio C Hamano1-1/+8
2024-02-27Merge branch 'jc/am-whitespace-doc'Junio C Hamano1-1/+2
2024-02-26Merge branch 'cp/apply-core-filemode'Junio C Hamano1-3/+13
2024-02-14doc: add shortcut to "am --whitespace=<action>"Junio C Hamano1-1/+2
2023-12-26apply: code simplificationJunio C Hamano1-4/+8
2023-12-26apply: correctly reverse patch's pre- and post-image mode bitsJunio C Hamano1-4/+4
2023-12-26apply: ignore working tree filemode when !core.filemodeChandra Pratap1-2/+8
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-2/+0
2023-07-06Merge branch 'pw/apply-too-large'Junio C Hamano1-3/+4
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan1-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-26apply: improve error messages when reading patchPhillip Wood1-3/+4
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21merge-ll: rename from ll-mergeElijah Newren1-1/+1
2023-06-21git-compat-util.h: remove unneccessary include of wildmatch.hElijah Newren1-0/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-21name-hash.h: move declarations for name-hash.c from cache.hElijah Newren1-0/+1
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano1-0/+3
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano1-0/+2
2023-04-24Sync with Git 2.40.1Junio C Hamano1-2/+12
2023-04-24ws.h: move declarations for ws.c functions from cache.hElijah Newren1-0/+1
2023-04-24base85.h: move declarations for base85.c functions from cache.hElijah Newren1-0/+1
2023-04-24symlinks.h: move declarations for symlinks.c functions from cache.hElijah Newren1-0/+1
2023-04-17Sync with 2.39.3Johannes Schindelin1-2/+12
2023-04-17Sync with 2.38.5Johannes Schindelin1-2/+12
2023-04-17Sync with 2.36.6Johannes Schindelin1-2/+12
2023-04-17Sync with 2.35.8Johannes Schindelin1-2/+12
2023-04-17Sync with 2.34.8Johannes Schindelin1-2/+12
2023-04-17Sync with 2.32.7Johannes Schindelin1-2/+12
2023-04-17Sync with 2.31.8Johannes Schindelin1-2/+12
2023-04-17Sync with 2.30.9Johannes Schindelin1-2/+12
2023-04-17apply --reject: overwrite existing `.rej` symlink if it existsJohannes Schindelin1-2/+12
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-0/+5
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-5/+8
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-5/+8
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+6
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+2
2023-03-21setup.h: move declarations for setup.c functions from cache.hElijah Newren1-0/+1
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren1-0/+1
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-23alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren1-0/+1
2023-02-14Merge branch 'jk/unused-post-2.39' into maint-2.39Junio C Hamano1-2/+2
2023-02-13Sync with Git 2.39.2Junio C Hamano1-0/+27
2023-02-06Sync with 2.38.4Johannes Schindelin1-0/+27
2023-02-06Sync with 2.36.5Johannes Schindelin1-0/+27
2023-02-06Sync with 2.35.7Johannes Schindelin1-0/+27
2023-02-06Sync with 2.34.7Johannes Schindelin1-0/+27
2023-02-06Sync with 2.32.6Johannes Schindelin1-0/+27
2023-02-06Sync with 2.31.7Johannes Schindelin1-0/+27
2023-02-06Sync with 2.30.8Johannes Schindelin1-0/+27
2023-02-03apply: fix writing behind newly created symbolic linksPatrick Steinhardt1-0/+27
2023-01-17treewide: always have a valid "index_state.repo" memberÆvar Arnfjörð Bjarmason1-1/+1
2023-01-16cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()Ævar Arnfjörð Bjarmason1-1/+1
2022-12-13ws: drop unused parameter from ws_blank_line()Jeff King1-2/+2
2022-10-30Merge branch 'tb/cap-patch-at-1gb'Taylor Blau1-1/+11
2022-10-25apply: reject patches larger than ~1 GiBTaylor Blau1-1/+11
2022-10-17apply: mark unused parameters in noop error/warning routineJeff King1-1/+1
2022-10-17apply: mark unused parameters in handlersJeff King1-8/+8
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano1-3/+3
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano1-3/+3
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-3/+3
2022-03-16Merge branch 'ab/object-file-api-updates'Junio C Hamano1-6/+6
2022-03-04range-diff: plug memory leak in common invocationÆvar Arnfjörð Bjarmason1-1/+6
2022-02-25object-file API: have hash_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason1-2/+2
2022-02-25object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason1-4/+4
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano1-1/+4
2022-02-05Merge branch 'rs/apply-symlinks-use-strset'Junio C Hamano1-34/+8
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-1/+4
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-4/+4
2022-01-10Merge branch 'jz/apply-3-corner-cases'Junio C Hamano1-1/+3
2022-01-07apply: use strsets to track symlinksRené Scharfe1-34/+8
2022-01-05i18n: factorize "--foo outside a repository"Jean-Noël Avila1-3/+3
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila1-1/+1
2021-12-20git-apply: skip threeway in add / rename casesJerry Zhang1-1/+3
2021-12-13git-apply: add --allow-empty flagJerry Zhang1-2/+6
2021-12-13git-apply: add --quiet flagJerry Zhang1-1/+1
2021-10-12Merge branch 'jc/trivial-threeway-binary-merge' into maintJunio C Hamano1-0/+21
2021-10-12Merge branch 'jk/apply-binary-hunk-parsing-fix' into maintJunio C Hamano1-0/+1
2021-09-15Merge branch 'jc/trivial-threeway-binary-merge'Junio C Hamano1-0/+21
2021-09-05apply: resolve trivial merge without hitting ll-merge with "--3way"Junio C Hamano1-0/+21
2021-08-30Merge branch 'jk/apply-binary-hunk-parsing-fix'Junio C Hamano1-0/+1
2021-08-10apply: keep buffer/size pair in sync when parsing binary hunksJeff King1-0/+1
2021-07-01string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason1-3/+3
2021-05-07Merge branch 'jz/apply-3way-first-message-fix'Junio C Hamano1-1/+5
2021-04-29apply: adjust messages to account for --3way changesJerry Zhang1-1/+5
2021-04-07git-apply: allow simultaneous --cached and --3way optionsJerry Zhang1-3/+6
2021-04-06git-apply: try threeway first when "--3way" is usedJerry Zhang1-7/+6
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano1-0/+1
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares1-0/+1
2021-03-13use CALLOC_ARRAYRené Scharfe1-3/+3
2020-12-18Merge branch 'ab/unreachable-break'Junio C Hamano1-2/+0
2020-12-15style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason1-2/+0
2020-12-08Merge branch 'mt/do-not-use-scld-in-working-tree'Junio C Hamano1-1/+1
2020-12-02apply: don't use core.sharedRepository to create working tree filesMatheus Tavares1-1/+1
2020-10-20apply: when -R, also reverse list of sectionsJonathan Tan1-2/+7
2020-08-27Merge branch 'jk/leakfix'Junio C Hamano1-2/+2
2020-08-17Merge branch 'rp/apply-cached-with-i-t-a'Junio C Hamano1-4/+21
2020-08-17config: drop git_config_get_string_const()Jeff King1-2/+2
2020-08-09apply: make i-t-a entries never match worktreeRaymond E. Pasco1-5/+19
2020-08-06apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco1-4/+7
2020-08-06apply: do not lazy fetch when applying binaryJonathan Tan1-1/+1
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu1-14/+14
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson1-1/+1
2020-01-31sha1-file: pass git_hash_algo to hash_object_file()Matheus Tavares1-2/+4
2019-12-16Merge branch 'js/add-i-a-bit-more-tests'Junio C Hamano1-0/+10
2019-12-06Merge branch 'jk/lore-is-the-archive'Junio C Hamano1-1/+1
2019-12-06apply --allow-overlap: fix a corner caseJohannes Schindelin1-0/+10
2019-12-01Merge branch 'en/doc-typofix'Junio C Hamano1-2/+2
2019-11-30doc: replace public-inbox links with lore.kernel.orgJeff King1-1/+1
2019-11-10Merge branch 'dl/apply-3way-diff3'Junio C Hamano1-1/+1
2019-11-10Fix spelling errors in code commentsElijah Newren1-2/+2
2019-10-24apply: respect merge.conflictStyle in --3wayDenton Liu1-1/+1
2019-10-15Merge branch 'tg/range-diff-output-update'Junio C Hamano1-21/+22
2019-10-09range-diff: don't segfault with mode-only changesThomas Gummerer1-21/+22
2019-09-09Merge branch 'bc/reread-attributes-during-rebase'Junio C Hamano1-0/+11
2019-09-03am: reload .gitattributes after patching itbrian m. carlson1-0/+11
2019-07-11apply: make parse_git_diff_header publicThomas Gummerer1-50/+19
2019-07-11apply: only pass required data to gitdiff_* functionsThomas Gummerer1-24/+35
2019-07-09apply: only pass required data to find_name_*Thomas Gummerer1-24/+24
2019-07-09apply: only pass required data to check_header_lineThomas Gummerer1-4/+4
2019-07-09apply: only pass required data to git_header_nameThomas Gummerer1-8/+8
2019-07-09apply: only pass required data to skip_tree_prefixThomas Gummerer1-9/+9
2019-07-09apply: replace marc.info link with public-inboxThomas Gummerer1-1/+1
2019-05-28fill_stat_cache_info(): prepare for an fsmonitor fixJohannes Schindelin1-1/+1
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy1-0/+4
2019-02-06Merge branch 'jk/loose-object-cache-oid'Junio C Hamano1-1/+1
2019-02-06Merge branch 'jk/unused-parameter-cleanup'Junio C Hamano1-3/+2
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-2/+3
2019-01-24apply: drop unused "def" parameter from find_name_gnu()Jeff King1-3/+2
2019-01-14Merge branch 'nd/checkout-noisy'Junio C Hamano1-1/+2
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy1-1/+2
2019-01-08convert has_sha1_file() callers to has_object_file()Jeff King1-1/+1
2018-11-18Merge branch 'js/apply-recount-allow-noop'Junio C Hamano1-1/+1
2018-11-14checkout: print something when checking out pathsNguyễn Thái Ngọc Duy1-1/+2
2018-11-13apply --recount: allow "no-op hunks"Johannes Schindelin1-1/+1
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksJeff King1-0/+18
2018-11-06apply: return -1 from option callback instead of calling exit(1)Jeff King1-1/+1
2018-11-06apply: mark include/exclude options as NONEGJeff King1-2/+2
2018-10-30Merge branch 'bc/hash-transition-part-15'Junio C Hamano1-24/+26
2018-10-15apply: rename new_sha1_prefix and old_sha1_prefixbrian m. carlson1-20/+20
2018-10-15apply: replace hard-coded constantsbrian m. carlson1-8/+10
2018-09-21ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-3/+5
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-3/+6
2018-08-13apply.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-21/+25
2018-08-13apply.c: make init_apply_state() take a struct repositoryNguyễn Thái Ngọc Duy1-0/+2
2018-08-13apply.c: pass struct apply_state to more functionsNguyễn Thái Ngọc Duy1-7/+11
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano1-13/+11
2018-07-24Merge branch 'en/apply-comment-fix'Junio C Hamano1-1/+1
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-0/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller1-13/+11
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller1-1/+1
2018-06-28apply: fix grammar error in commentElijah Newren1-1/+1
2018-06-25Merge branch 'nd/diff-apply-ita'Junio C Hamano1-7/+12
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano1-2/+2
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano1-1/+1
2018-05-29Sync with Git 2.17.1Junio C Hamano1-2/+2
2018-05-29apply: add --intent-to-addNguyễn Thái Ngọc Duy1-7/+12
2018-05-22Sync with Git 2.16.4Junio C Hamano1-2/+2
2018-05-22Sync with Git 2.15.2Junio C Hamano1-2/+2
2018-05-22Sync with Git 2.14.4Junio C Hamano1-2/+2
2018-05-22Sync with Git 2.13.7Junio C Hamano1-2/+2
2018-05-21verify_path: disallow symlinks in .gitmodulesJeff King1-2/+2
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-05-10lock_file: make function-local locks non-staticMartin Ågren1-1/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-2/+2
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano1-2/+3
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-2/+2
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano1-61/+61
2018-02-28Merge branch 'tk/apply-dev-null-verify-name-fix'Junio C Hamano1-1/+1
2018-02-22apply: rename 'new' variablesBrandon Williams1-27/+27
2018-02-22apply: rename 'try' variablesBrandon Williams1-34/+34
2018-02-15Merge branch 'po/object-id'Junio C Hamano1-6/+6
2018-02-15apply: handle Subversion diffs with /dev/null gracefullyTatyana Krasnukha1-1/+1
2018-02-09completion: use __gitcomp_builtin in _git_applyNguyễn Thái Ngọc Duy1-2/+3
2018-01-30sha1_file: convert write_sha1_file to object_idPatryk Obara1-4/+4
2018-01-30sha1_file: convert hash_sha1_file to object_idPatryk Obara1-2/+2
2018-01-16convert_to_git(): safe_crlf/checksafe becomes int conv_flagsTorsten Bögershausen1-3/+3
2017-12-06Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano1-0/+2
2017-11-27Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano1-0/+2
2017-11-27Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano1-39/+20
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 11:02:47 +0000