summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* convert: update subprocess_read_status() to not die on EOFbp/sub-process-convert-filterBen Peart2017-05-153-6/+16
* sub-process: move sub-process functions into separate filesBen Peart2017-05-155-103/+212
* convert: rename reusable sub-process functionsBen Peart2017-05-151-20/+20
* convert: update generic functions to only use generic data structuresBen Peart2017-05-151-18/+23
* convert: separate generic structures and variables from the filter specific onesBen Peart2017-05-151-15/+20
* convert: split start_multi_file_filter() into two separate functionsBen Peart2017-05-151-24/+34
* pkt-line: annotate packet_writel with LAST_ARG_MUST_BE_NULLJeff King2017-05-151-0/+1
* convert: move packet_write_line() into pkt-line as packet_writel()Ben Peart2017-05-083-21/+22
* pkt-line: add packet_read_line_gently()Ben Peart2017-05-082-0/+23
* pkt-line: fix packet_read_line() to handle len < 0 errorsBen Peart2017-05-081-1/+1
* convert: remove erroneous tests for errno == EPIPEBen Peart2017-05-081-2/+2
* Ninth batch for 2.13Junio C Hamano2017-03-281-30/+24
* Sync with 'maint'Junio C Hamano2017-03-281-0/+57
|\
| * Prepare for 2.12.3Junio C Hamano2017-03-282-1/+58
| * Merge branch 'km/config-grammofix' into maintJunio C Hamano2017-03-281-3/+3
| |\
| * \ Merge branch 'sb/t3600-rephrase' into maintJunio C Hamano2017-03-281-1/+1
| |\ \
| * \ \ Merge branch 'sb/submodule-update-initial-runs-custom-script' into maintJunio C Hamano2017-03-281-3/+3
| |\ \ \
| * \ \ \ Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-03-281-0/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/update-hook-optim' into maintJunio C Hamano2017-03-281-8/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/shortlog-cleanup' into maintJunio C Hamano2017-03-281-1/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/path-name-safety-cleanup' into maintJunio C Hamano2017-03-281-2/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/http-push-cleanup' into maintJunio C Hamano2017-03-281-5/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/wt-status-cleanup' into maintJunio C Hamano2017-03-281-15/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-name-cleanups' into maintJunio C Hamano2017-03-286-46/+57
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-cleanup' into maintJunio C Hamano2017-03-281-52/+57
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/blame-code-cleanup' into maintJunio C Hamano2017-03-281-17/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'st/verify-tag' into maintJunio C Hamano2017-03-282-14/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2017-03-282-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano2017-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/http-alternates-as-redirects-warning' into maintJunio C Hamano2017-03-281-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dp/filter-branch-prune-empty' into maintJunio C Hamano2017-03-284-8/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maintJunio C Hamano2017-03-287-30/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano2017-03-2810-51/+249
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/cond-skip-tests' into maintJunio C Hamano2017-03-283-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ident-empty' into maintJunio C Hamano2017-03-282-19/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/delta-chain-limit' into maintJunio C Hamano2017-03-283-23/+207
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/test-with-stdin' into maintJunio C Hamano2017-03-282-8/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/interop-test' into maintJunio C Hamano2017-03-288-1/+270
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/perf-updates' into maintJunio C Hamano2017-03-283-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/strbuf-add-real-path' into maintJunio C Hamano2017-03-286-2/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/parse-config-key-cleanup' into maintJunio C Hamano2017-03-283-10/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sha1dc'Junio C Hamano2017-03-281-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1dc: avoid CPP macro collisionsjk/sha1dcJunio C Hamano2017-03-261-5/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/memihash-opt'Junio C Hamano2017-03-289-9/+848
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: add test-lazy-init-name-hash to .gitignoreRamsay Jones2017-03-241-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: add perf test for lazy_init_name_hashJeff Hostetler2017-03-241-0/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: add test-lazy-init-name-hashJeff Hostetler2017-03-243-0/+266
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: perf improvement for lazy_init_name_hashJeff Hostetler2017-03-241-7/+485
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: document memihash_cont, hashmap_disallow_rehash apiJeff Hostetler2017-03-231-0/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: add disallow_rehash settingJeff Hostetler2017-03-222-1/+35
View Lorry Controller Status