summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.18-rc0v2.18.0-rc0Junio C Hamano2018-05-302-1/+37
* Merge branch 'bw/remote-curl-compressed-responses'Junio C Hamano2018-05-303-6/+12
|\
| * remote-curl: accept compressed responses with protocol v2Brandon Williams2018-05-231-0/+1
| * remote-curl: accept all encodings supported by curlBrandon Williams2018-05-233-6/+11
* | Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano2018-05-307-37/+64
|\ \
| * | unpack_trees_options: free messages when doneMartin Ågren2018-05-225-4/+26
| * | argv-array: return the pushed string from argv_push*()Junio C Hamano2018-05-222-4/+6
| * | merge-recursive: provide pair of `unpack_trees_{start,finish}()`Elijah Newren2018-05-211-14/+15
| * | merge: setup `opts` later in `checkout_fast_forward()`Martin Ågren2018-05-211-15/+17
* | | Merge branch 'bc/hash-independent-tests'Junio C Hamano2018-05-3071-267/+338
|\ \ \
| * | | t5300: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-3/+5
| * | | t4208: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-1/+2
| * | | t4045: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-2/+4
| * | | t4042: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-6/+10
| * | | t4205: sort log output in a hash-independent waybrian m. carlson2018-05-211-4/+4
| * | | t/lib-diff-alternative: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-4/+8
| * | | t4030: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-2/+3
| * | | t4029: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-1/+6
| * | | t4029: fix test indentationbrian m. carlson2018-05-211-17/+16
| * | | t4022: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-2/+4
| * | | t4020: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-2/+8
| * | | t4014: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-3/+6
| * | | t4008: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-27/+32
| * | | t4007: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-8/+9
| * | | t3905: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-4/+7
| * | | t3702: abstract away SHA-1-specific constantsbrian m. carlson2018-05-211-4/+3
| * | | t3103: abstract away SHA-1-specific constantsbrian m. carlson2018-05-141-1/+2
| * | | t2203: abstract away SHA-1-specific constantsbrian m. carlson2018-05-141-4/+4
| * | | t: skip pack tests if not using SHA-1brian m. carlson2018-05-142-0/+12
| * | | t4044: skip test if not using SHA-1brian m. carlson2018-05-141-0/+6
| * | | t1512: skip test if not using SHA-1brian m. carlson2018-05-141-0/+6
| * | | t1007: annotate with SHA1 prerequisitebrian m. carlson2018-05-141-8/+8
| * | | t0000: annotate with SHA1 prerequisitebrian m. carlson2018-05-141-12/+12
| * | | t: switch $_x40 to $OID_REGEXbrian m. carlson2018-05-1420-33/+33
| * | | t/test-lib: introduce OID_REGEXbrian m. carlson2018-05-141-1/+2
| * | | t: switch $_z40 to $ZERO_OIDbrian m. carlson2018-05-1432-119/+119
| * | | t/test-lib: introduce ZERO_OIDbrian m. carlson2018-05-141-1/+2
| * | | t/test-lib: add an SHA1 prerequisitebrian m. carlson2018-05-141-0/+7
| | |/ | |/|
* | | Merge branch 'ma/regex-no-regfree-after-comp-fail'Junio C Hamano2018-05-302-3/+0
|\ \ \
| * | | regex: do not call `regfree()` if compilation failsMartin Ågren2018-05-212-3/+0
* | | | Merge branch 'ma/config-store-data-clear'Junio C Hamano2018-05-301-18/+18
|\ \ \ \
| * | | | config: let `config_store_data_clear()` handle `key`Martin Ågren2018-05-211-7/+3
| * | | | config: let `config_store_data_clear()` handle `value_regex`Martin Ågren2018-05-211-11/+6
| * | | | config: free resources of `struct config_store_data`Martin Ågren2018-05-211-0/+9
| | |/ / | |/| |
* | | | Merge branch 'jk/snprintf-truncation'Junio C Hamano2018-05-306-50/+55
|\ \ \ \
| * | | | fmt_with_err: add a comment that truncation is OKJeff King2018-05-211-0/+1
| * | | | shorten_unambiguous_ref: use xsnprintfJeff King2018-05-211-2/+2
| * | | | fsmonitor: use internal argv_array of struct child_processRené Scharfe2018-05-211-10/+4
| * | | | log_write_email_headers: use strbufsJeff King2018-05-211-6/+10
| * | | | http: use strbufs instead of fixed buffersJeff King2018-05-212-32/+38
| | |/ / | |/| |