summaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAgeFilesLines
* convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flagsTorsten Bögershausen2018-01-161-3/+3
* Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano2017-11-271-0/+2
|\
| * apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-lineRené Scharfe2017-11-171-0/+2
* | Merge branch 'rs/apply-fuzzy-match-fix'Junio C Hamano2017-11-211-39/+20
|\ \
| * | apply: avoid out-of-bounds access in fuzzy_matchlines()rs/apply-fuzzy-match-fixRené Scharfe2017-11-121-39/+20
* | | apply: remove `newfd` from `struct apply_state`Martin Ågren2017-10-061-11/+6
* | | apply: move lockfile into `apply_state`Martin Ågren2017-10-061-9/+5
* | | consistently use "fallthrough" comments in switchesjk/fallthroughJeff King2017-09-221-1/+2
* | | Merge branch 'rs/apply-epoch'Junio C Hamano2017-09-101-19/+18
|\ \ \
| * | | apply: remove epoch date from regexrs/apply-epochRené Scharfe2017-08-251-7/+5
| * | | apply: check date of potential epoch timestamps firstRené Scharfe2017-08-251-16/+17
* | | | Merge branch 'tb/apply-with-crlf'Junio C Hamano2017-08-261-5/+36
|\ \ \ \
| * | | | apply: file commited with CRLF should roundtrip diff and applytb/apply-with-crlfTorsten Bögershausen2017-08-191-5/+36
* | | | | Merge branch 'rs/apply-lose-prefix-length'Junio C Hamano2017-08-221-7/+5
|\ \ \ \ \
| * | | | | apply: remove prefix_length member from apply_staters/apply-lose-prefix-lengthRené Scharfe2017-08-091-7/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs/move-array'Junio C Hamano2017-08-111-7/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe2017-07-171-7/+4
| | |/ / | |/| |
* | | | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-2/+2
|/ / /
* | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-121-2/+1
|\ \ \
| * | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()rs/apply-avoid-over-readingRené Scharfe2017-07-091-2/+1
* | | | Merge branch 'ab/wildmatch'Junio C Hamano2017-07-101-1/+1
|\ \ \ \
| * | | | wildmatch: remove unused wildopts parameterab/wildmatchÆvar Arnfjörð Bjarmason2017-06-231-1/+1
* | | | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-061-2/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | apply: use starts_with() in gitdiff_verify_name()René Scharfe2017-07-011-2/+1
* | | | | Merge branch 'rs/apply-validate-input'Junio C Hamano2017-06-301-6/+29
|\ \ \ \ \
| * | | | | apply: check git diffs for mutually exclusive header linesrs/apply-validate-inputRené Scharfe2017-06-271-0/+15
| * | | | | apply: check git diffs for invalid file modesRené Scharfe2017-06-271-5/+12
| * | | | | apply: check git diffs for missing old filenamesRené Scharfe2017-06-271-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\ \ \ \ \
| * | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ \ \ \
| * | | | | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | | | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | convert: convert convert_to_git to take an indexBrandon Williams2017-06-131-1/+1
* | | | | | | Merge branch 'pc/dir-count-slashes'Junio C Hamano2017-06-221-11/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | dir: create function count_slashes()pc/dir-count-slashesPrathamesh Chavan2017-06-121-11/+0
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/noent-notdir'Junio C Hamano2017-06-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedjc/noent-notdirJunio C Hamano2017-05-301-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/apply-fix-mismerge'Junio C Hamano2017-05-161-169/+169
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | apply.c: fix whitespace-only mismergejc/apply-fix-mismergeJunio C Hamano2017-05-081-169/+169
| |/ / /
* | | | prefix_filename: return newly allocated stringJeff King2017-03-211-3/+6
* | | | prefix_filename: drop length parameterJeff King2017-03-211-4/+2
|/ / /
* | | apply: use SWAP macroRené Scharfe2017-01-301-16/+7
* | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-1/+1
|/ /
* | i18n: apply: mark error message for translationVasco Almeida2016-10-171-2/+2
* | i18n: apply: mark error messages for translationVasco Almeida2016-10-141-24/+24
* | i18n: apply: mark info messages for translationVasco Almeida2016-10-141-4/+4
* | i18n: apply: mark plural string for translationVasco Almeida2016-10-141-4/+6
* | introduce CHECKOUT_INITrs/checkout-init-macroRené Scharfe2016-09-221-3/+1
* | Merge branch 'bc/object-id'Junio C Hamano2016-09-191-215/+215
|\ \
View Lorry Controller Status