summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)AuthorFilesLines
2018-04-11Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesLibravatar Junio C Hamano1-61/+61
2018-02-22apply: rename 'new' variablesLibravatar Brandon Williams1-27/+27
2018-02-22apply: rename 'try' variablesLibravatar Brandon Williams1-34/+34
2018-02-15Merge branch 'po/object-id'Libravatar Junio C Hamano1-6/+6
2018-01-30sha1_file: convert write_sha1_file to object_idLibravatar Patryk Obara1-4/+4
2018-01-30sha1_file: convert hash_sha1_file to object_idLibravatar Patryk Obara1-2/+2
2018-01-16convert_to_git(): safe_crlf/checksafe becomes int conv_flagsLibravatar Torsten Bögershausen1-3/+3
2017-11-27Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Libravatar Junio C Hamano1-0/+2
2017-11-21Merge branch 'rs/apply-fuzzy-match-fix'Libravatar Junio C Hamano1-39/+20
2017-11-17apply: update line lengths for --inaccurate-eofLibravatar René Scharfe1-0/+2
2017-11-12apply: avoid out-of-bounds access in fuzzy_matchlines()Libravatar René Scharfe1-39/+20
2017-10-06apply: remove `newfd` from `struct apply_state`Libravatar Martin Ågren1-11/+6
2017-10-06apply: move lockfile into `apply_state`Libravatar Martin Ågren1-9/+5
2017-09-22consistently use "fallthrough" comments in switchesLibravatar Jeff King1-1/+2
2017-09-10Merge branch 'rs/apply-epoch'Libravatar Junio C Hamano1-19/+18
2017-08-26Merge branch 'tb/apply-with-crlf'Libravatar Junio C Hamano1-5/+36
2017-08-25apply: remove epoch date from regexLibravatar René Scharfe1-7/+5
2017-08-25apply: check date of potential epoch timestamps firstLibravatar René Scharfe1-16/+17
2017-08-22Merge branch 'rs/apply-lose-prefix-length'Libravatar Junio C Hamano1-7/+5
2017-08-19apply: file commited with CRLF should roundtrip diff and applyLibravatar Torsten Bögershausen1-5/+36
2017-08-11Merge branch 'rs/move-array'Libravatar Junio C Hamano1-7/+4
2017-08-09apply: remove prefix_length member from apply_stateLibravatar René Scharfe1-7/+5
2017-07-17apply: use COPY_ARRAY and MOVE_ARRAY in update_image()Libravatar René Scharfe1-7/+4
2017-07-17sha1_name: convert get_sha1* to get_oid*Libravatar brian m. carlson1-2/+2
2017-07-12Merge branch 'rs/apply-avoid-over-reading'Libravatar Junio C Hamano1-2/+1
2017-07-10Merge branch 'ab/wildmatch'Libravatar Junio C Hamano1-1/+1
2017-07-09apply: use strcmp(3) for comparing strings in gitdiff_verify_name()Libravatar René Scharfe1-2/+1
2017-07-06Merge branch 'rs/apply-avoid-over-reading'Libravatar Junio C Hamano1-2/+1
2017-07-01apply: use starts_with() in gitdiff_verify_name()Libravatar René Scharfe1-2/+1
2017-06-30Merge branch 'rs/apply-validate-input'Libravatar Junio C Hamano1-6/+29
2017-06-27apply: check git diffs for mutually exclusive header linesLibravatar René Scharfe1-0/+15
2017-06-27apply: check git diffs for invalid file modesLibravatar René Scharfe1-5/+12
2017-06-27apply: check git diffs for missing old filenamesLibravatar René Scharfe1-1/+2
2017-06-24Merge branch 'ab/free-and-null'Libravatar Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Libravatar Junio C Hamano1-1/+1
2017-06-23wildmatch: remove unused wildopts parameterLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2017-06-22Merge branch 'pc/dir-count-slashes'Libravatar Junio C Hamano1-11/+0
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleLibravatar Ævar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'jc/noent-notdir'Libravatar Junio C Hamano1-1/+1
2017-06-13convert: convert convert_to_git to take an indexLibravatar Brandon Williams1-1/+1
2017-06-12dir: create function count_slashes()Libravatar Prathamesh Chavan1-11/+0
2017-05-30treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedLibravatar Junio C Hamano1-1/+1
2017-05-16Merge branch 'jc/apply-fix-mismerge'Libravatar Junio C Hamano1-169/+169
2017-05-08apply.c: fix whitespace-only mismergeLibravatar Junio C Hamano1-169/+169
2017-03-21prefix_filename: return newly allocated stringLibravatar Jeff King1-3/+6
2017-03-21prefix_filename: drop length parameterLibravatar Jeff King1-4/+2
2017-01-30apply: use SWAP macroLibravatar René Scharfe1-16/+7
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Libravatar Junio C Hamano1-1/+1