aboutsummaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAge
* Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano2017-11-27
|\
| * apply: update line lengths for --inaccurate-eofRené Scharfe2017-11-17
* | Merge branch 'rs/apply-fuzzy-match-fix'Junio C Hamano2017-11-21
|\ \
| * | apply: avoid out-of-bounds access in fuzzy_matchlines()René Scharfe2017-11-12
* | | apply: remove `newfd` from `struct apply_state`Martin Ågren2017-10-06
* | | apply: move lockfile into `apply_state`Martin Ågren2017-10-06
* | | consistently use "fallthrough" comments in switchesJeff King2017-09-22
* | | Merge branch 'rs/apply-epoch'Junio C Hamano2017-09-10
|\ \ \
| * | | apply: remove epoch date from regexRené Scharfe2017-08-25
| * | | apply: check date of potential epoch timestamps firstRené Scharfe2017-08-25
* | | | Merge branch 'tb/apply-with-crlf'Junio C Hamano2017-08-26
|\ \ \ \
| * | | | apply: file commited with CRLF should roundtrip diff and applyTorsten Bögershausen2017-08-19
* | | | | Merge branch 'rs/apply-lose-prefix-length'Junio C Hamano2017-08-22
|\ \ \ \ \
| * | | | | apply: remove prefix_length member from apply_stateRené Scharfe2017-08-09
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs/move-array'Junio C Hamano2017-08-11
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe2017-07-17
| | |/ / | |/| |
* | | | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-17
|/ / /
* | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-12
|\ \ \
| * | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()René Scharfe2017-07-09
* | | | Merge branch 'ab/wildmatch'Junio C Hamano2017-07-10
|\ \ \ \
| * | | | wildmatch: remove unused wildopts parameterÆvar Arnfjörð Bjarmason2017-06-23
* | | | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-06
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | apply: use starts_with() in gitdiff_verify_name()René Scharfe2017-07-01
* | | | | Merge branch 'rs/apply-validate-input'Junio C Hamano2017-06-30
|\ \ \ \ \
| * | | | | apply: check git diffs for mutually exclusive header linesRené Scharfe2017-06-27
| * | | | | apply: check git diffs for invalid file modesRené Scharfe2017-06-27
| * | | | | apply: check git diffs for missing old filenamesRené Scharfe2017-06-27
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-24
|\ \ \ \ \
| * | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-16
* | | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\ \ \ \ \ \
| * | | | | | config: don't include config.h by defaultBrandon Williams2017-06-15
* | | | | | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | convert: convert convert_to_git to take an indexBrandon Williams2017-06-13
* | | | | | | Merge branch 'pc/dir-count-slashes'Junio C Hamano2017-06-22
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | dir: create function count_slashes()Prathamesh Chavan2017-06-12
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/noent-notdir'Junio C Hamano2017-06-13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedJunio C Hamano2017-05-30
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/apply-fix-mismerge'Junio C Hamano2017-05-16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | apply.c: fix whitespace-only mismergeJunio C Hamano2017-05-08
| |/ / /
* | | | prefix_filename: return newly allocated stringJeff King2017-03-21
* | | | prefix_filename: drop length parameterJeff King2017-03-21
|/ / /
* | | apply: use SWAP macroRené Scharfe2017-01-30
* | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-07
|/ /
* | i18n: apply: mark error message for translationVasco Almeida2016-10-17
* | i18n: apply: mark error messages for translationVasco Almeida2016-10-14
* | i18n: apply: mark info messages for translationVasco Almeida2016-10-14
* | i18n: apply: mark plural string for translationVasco Almeida2016-10-14
* | introduce CHECKOUT_INITRené Scharfe2016-09-22
* | Merge branch 'bc/object-id'Junio C Hamano2016-09-19
|\ \
* | | apply: learn to use a different index fileChristian Couder2016-09-07