summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)AuthorFilesLines
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-38/+19
2017-11-21Merge branch 'rs/apply-fuzzy-match-fix'Junio C Hamano1-38/+19
2017-11-17apply: update line lengths for --inaccurate-eofRené Scharfe1-0/+2
2017-11-12apply: avoid out-of-bounds access in fuzzy_matchlines()René Scharfe1-38/+19
2017-10-06apply: remove `newfd` from `struct apply_state`Martin Ågren1-11/+6
2017-10-06apply: move lockfile into `apply_state`Martin Ågren1-9/+5
2017-09-22consistently use "fallthrough" comments in switchesJeff King1-1/+2
2017-09-10Merge branch 'rs/apply-epoch'Junio C Hamano1-19/+18
2017-09-10Merge branch 'rs/apply-lose-prefix-length' into maintJunio C Hamano1-7/+5
2017-09-10Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano1-5/+36
2017-08-26Merge branch 'tb/apply-with-crlf'Junio C Hamano1-5/+36
2017-08-25apply: remove epoch date from regexRené Scharfe1-7/+5
2017-08-25apply: check date of potential epoch timestamps firstRené Scharfe1-16/+17
2017-08-22Merge branch 'rs/apply-lose-prefix-length'Junio C Hamano1-7/+5
2017-08-19apply: file commited with CRLF should roundtrip diff and applyTorsten Bögershausen1-5/+36
2017-08-11Merge branch 'rs/move-array'Junio C Hamano1-7/+4
2017-08-09apply: remove prefix_length member from apply_stateRené Scharfe1-7/+5
2017-07-31Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano1-4/+2
2017-07-17apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe1-7/+4
2017-07-17sha1_name: convert get_sha1* to get_oid*brian m. carlson1-2/+2
2017-07-12Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano1-2/+1
2017-07-10Merge branch 'rs/apply-validate-input' into maintJunio C Hamano1-6/+29
2017-07-10Merge branch 'ab/wildmatch'Junio C Hamano1-1/+1
2017-07-09apply: use strcmp(3) for comparing strings in gitdiff_verify_name()René Scharfe1-2/+1
2017-07-06Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano1-2/+1
2017-07-01apply: use starts_with() in gitdiff_verify_name()René Scharfe1-2/+1
2017-06-30Merge branch 'rs/apply-validate-input'Junio C Hamano1-6/+29
2017-06-27apply: check git diffs for mutually exclusive header linesRené Scharfe1-0/+15
2017-06-27apply: check git diffs for invalid file modesRené Scharfe1-5/+12
2017-06-27apply: check git diffs for missing old filenamesRené Scharfe1-1/+2
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano1-1/+1
2017-06-23wildmatch: remove unused wildopts parameterÆvar Arnfjörð Bjarmason1-1/+1