Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/cmd-foo-should-return' | Junio C Hamano | 2021-07-08 | 4 | -4/+4 |
|\ | |||||
| * | builtins + test helpers: use return instead of exit() in cmd_* | Ævar Arnfjörð Bjarmason | 2021-06-09 | 4 | -4/+4 |
* | | Merge branch 'en/ort-perf-batch-11' | Junio C Hamano | 2021-06-14 | 1 | -20/+34 |
|\ \ | |||||
| * | | fast-rebase: write conflict state to working tree, index, and HEAD | Elijah Newren | 2021-05-20 | 1 | -19/+32 |
| * | | fast-rebase: change assert() to BUG() | Elijah Newren | 2021-05-20 | 1 | -1/+2 |
* | | | Merge branch 'jk/symlinked-dotgitx-cleanup' | Junio C Hamano | 2021-05-11 | 1 | -13/+33 |
|\ \ \ | |||||
| * | | | t0060: test ntfs/hfs-obscured dotfiles | Jeff King | 2021-05-04 | 1 | -13/+33 |
* | | | | Merge branch 'bc/hash-transition-interop-part-1' | Junio C Hamano | 2021-05-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | hash: provide per-algorithm null OIDs | brian m. carlson | 2021-04-27 | 1 | -1/+1 |
* | | | | Merge branch 'ds/sparse-index-protections' | Junio C Hamano | 2021-04-30 | 1 | -10/+56 |
|\ \ \ \ | |||||
| * | | | | test-tool: don't force full index | Derrick Stolee | 2021-03-30 | 1 | -1/+12 |
| * | | | | test-read-cache: print cache entries with --table | Derrick Stolee | 2021-03-30 | 1 | -10/+45 |
* | | | | | Merge branch 'jk/promisor-optim' | Junio C Hamano | 2021-04-30 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | lookup_unknown_object(): take a repository argument | Jeff King | 2021-04-13 | 1 | -3/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ab/userdiff-tests' | Junio C Hamano | 2021-04-21 | 3 | -0/+48 |
|\ \ \ \ \ | |||||
| * | | | | | userdiff tests: list builtin drivers via test-tool | Ævar Arnfjörð Bjarmason | 2021-04-08 | 3 | -0/+48 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'cc/test-helper-bloom-usage-fix' | Junio C Hamano | 2021-04-14 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | test-bloom: fix missing 'bloom' from usage string | Christian Couder | 2021-04-06 | 1 | -1/+1 |
* | | | | | | Merge branch 'tb/pack-preferred-tips-to-give-bitmap' | Junio C Hamano | 2021-04-14 | 3 | -0/+26 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | t/helper/test-bitmap.c: initial commit | Taylor Blau | 2021-04-01 | 3 | -0/+26 |
* | | | | | | Merge branch 'tb/reverse-midx' | Junio C Hamano | 2021-04-08 | 1 | -4/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/helper/test-read-midx.c: add '--show-objects' | Taylor Blau | 2021-03-30 | 1 | -4/+20 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jh/simple-ipc' | Junio C Hamano | 2021-04-02 | 3 | -0/+789 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | t0052: add simple-ipc tests and t/helper/test-simple-ipc tool | Jeff Hostetler | 2021-03-22 | 3 | -0/+789 |
* | | | | | | Merge branch 'nk/diff-index-fsmonitor' | Junio C Hamano | 2021-03-24 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | fsmonitor: add perf test for git diff HEAD | Nipunn Koorapati | 2021-03-18 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jc/calloc-fix' | Junio C Hamano | 2021-03-19 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | xcalloc: use CALLOC_ARRAY() when applicable | Junio C Hamano | 2021-03-16 | 1 | -1/+1 |
* | | | | | Merge branch 'jt/trace2-BUG' | Junio C Hamano | 2021-02-18 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | usage: trace2 BUG() invocations | Jonathan Tan | 2021-02-09 | 1 | -0/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ak/corrected-commit-date' | Junio C Hamano | 2021-02-18 | 1 | -0/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | commit-graph: implement generation data chunk | Abhishek Kumar | 2021-01-19 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'ab/grep-pcre-invalid-utf8' | Junio C Hamano | 2021-02-10 | 3 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | grep/pcre2: better support invalid UTF-8 haystacks | Ævar Arnfjörð Bjarmason | 2021-01-25 | 3 | -0/+14 |
| |/ / / | |||||
* / / / | refs: switch peel_ref() to peel_iterated_oid() | Jeff King | 2021-01-22 | 1 | -13/+0 |
|/ / / | |||||
* | | | Merge branch 'jx/t5411-flake-fix' | Junio C Hamano | 2020-11-26 | 1 | -14/+40 |
|\ \ \ | |||||
| * | | | receive-pack: use default version 0 for proc-receive | Jiang Xin | 2020-11-11 | 1 | -6/+10 |
| * | | | receive-pack: gently write messages to proc-receive | Jiang Xin | 2020-11-11 | 1 | -10/+32 |
* | | | | Merge branch 'en/strmap' | Junio C Hamano | 2020-11-22 | 1 | -5/+4 |
|\ \ \ \ | |||||
| * | | | | Use new HASHMAP_INIT macro to simplify hashmap initialization | Elijah Newren | 2020-11-11 | 1 | -2/+1 |
| * | | | | hashmap: provide deallocation function names | Elijah Newren | 2020-11-02 | 1 | -3/+3 |
| |/ / / | |||||
* | | | | Merge branch 'en/merge-ort-api-null-impl' | Junio C Hamano | 2020-11-18 | 3 | -0/+213 |
|\ \ \ \ | |||||
| * | | | | fast-rebase: demonstrate merge-ort's API via new test-tool command | Elijah Newren | 2020-10-29 | 3 | -0/+213 |
| |/ / / | |||||
* | | | | Merge branch 'ds/maintenance-part-3' | Junio C Hamano | 2020-11-18 | 3 | -0/+37 |
|\ \ \ \ | |||||
| * | | | | maintenance: add start/stop subcommands | Derrick Stolee | 2020-09-25 | 3 | -0/+37 |
* | | | | | Merge branch 'js/avoid-split-sideband-message' | Junio C Hamano | 2020-11-02 | 1 | -0/+23 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | test-pkt-line: drop colon from sideband identity | Jeff King | 2020-10-27 | 1 | -1/+1 |
| * | | | | sideband: avoid reporting incomplete sideband messages | Johannes Schindelin | 2020-10-20 | 1 | -0/+23 |
* | | | | | Merge branch 'jk/unused' | Junio C Hamano | 2020-10-05 | 2 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | test-advise: check argument count with argc instead of argv | Jeff King | 2020-09-30 | 1 | -2/+2 |