Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | Merge branch 'rs/cocci-strbuf-addf-to-addstr' | Junio C Hamano | 2018-02-15 | 1 | -16/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | cocci: simplify check for trivial format stringsrs/cocci-strbuf-addf-to-addstr | René Scharfe | 2018-02-02 | 1 | -16/+1 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'nd/trace-index-ops' | Junio C Hamano | 2018-02-15 | 5 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | trace: measure where the time is spent in the index-heavy operationsnd/trace-index-ops | Nguyễn Thái Ngọc Duy | 2018-02-02 | 5 | -0/+18 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'cc/perf-aggregate' | Junio C Hamano | 2018-02-15 | 1 | -11/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | perf/aggregate: sort JSON fields in outputcc/perf-aggregate | Christian Couder | 2018-02-02 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | perf/aggregate: add --reponame option | Christian Couder | 2018-02-02 | 1 | -2/+13 | |
| * | | | | | | | | | | | | | | | perf/aggregate: add --subsection option | Christian Couder | 2018-02-02 | 1 | -9/+24 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ab/wildmatch-tests' | Junio C Hamano | 2018-02-15 | 3 | -245/+416 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | wildmatch test: mark test as EXPENSIVE_ON_WINDOWSab/wildmatch-tests | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -8/+8 | |
| * | | | | | | | | | | | | | | | test-lib: add an EXPENSIVE_ON_WINDOWS prerequisite | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | wildmatch test: create & test files on disk in addition to in-memory | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -11/+190 | |
| * | | | | | | | | | | | | | | | wildmatch test: perform all tests under all wildmatch() modes | Ævar Arnfjörð Bjarmason | 2018-01-30 | 2 | -252/+228 | |
| * | | | | | | | | | | | | | | | wildmatch test: use test_must_fail, not ! for test-wildmatch | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | wildmatch test: remove dead fnmatch() test code | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -178/+178 | |
| * | | | | | | | | | | | | | | | wildmatch test: use a paranoia pattern from nul_match() | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -3/+12 | |
| * | | | | | | | | | | | | | | | wildmatch test: don't try to vertically align our output | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | wildmatch test: use more standard shell style | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -3/+6 | |
| * | | | | | | | | | | | | | | | wildmatch test: indent with tabs, not spaces | Ævar Arnfjörð Bjarmason | 2018-01-30 | 1 | -27/+27 | |
* | | | | | | | | | | | | | | | | Merge branch 'po/object-id' | Junio C Hamano | 2018-02-15 | 39 | -281/+302 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | sha1_file: rename hash_sha1_file_literallypo/object-id | Patryk Obara | 2018-01-30 | 3 | -4/+8 | |
| * | | | | | | | | | | | | | | | | sha1_file: convert write_loose_object to object_id | Patryk Obara | 2018-01-30 | 1 | -12/+16 | |
| * | | | | | | | | | | | | | | | | sha1_file: convert force_object_loose to object_id | Patryk Obara | 2018-01-30 | 3 | -7/+8 | |
| * | | | | | | | | | | | | | | | | sha1_file: convert write_sha1_file to object_id | Patryk Obara | 2018-01-30 | 18 | -58/+65 | |
| * | | | | | | | | | | | | | | | | notes: convert write_notes_tree to object_id | Patryk Obara | 2018-01-30 | 4 | -11/+13 | |
| * | | | | | | | | | | | | | | | | notes: convert combine_notes_* to object_id | Patryk Obara | 2018-01-30 | 2 | -33/+38 | |
| * | | | | | | | | | | | | | | | | commit: convert commit_tree* to object_id | Patryk Obara | 2018-01-30 | 10 | -34/+36 | |
| * | | | | | | | | | | | | | | | | match-trees: convert splice_tree to object_id | Patryk Obara | 2018-01-30 | 1 | -24/+22 | |
| * | | | | | | | | | | | | | | | | cache: clear whole hash buffer with oidclr | Patryk Obara | 2018-01-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | sha1_file: convert hash_sha1_file to object_id | Patryk Obara | 2018-01-30 | 11 | -35/+36 | |
| * | | | | | | | | | | | | | | | | dir: convert struct sha1_stat to use object_id | Patryk Obara | 2018-01-30 | 4 | -64/+58 | |
| * | | | | | | | | | | | | | | | | sha1_file: convert pretend_sha1_file to object_id | Patryk Obara | 2018-01-30 | 4 | -8/+11 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'sb/pull-rebase-submodule' | Junio C Hamano | 2018-02-15 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | builtin/pull: respect verbosity settings in submodulessb/pull-rebase-submodule | Stefan Beller | 2018-01-25 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | Merge branch 'kg/packed-ref-cache-fix' | Junio C Hamano | 2018-02-15 | 1 | -51/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | packed_ref_cache: don't use mmap() for small fileskg/packed-ref-cache-fix | Kim Gybels | 2018-01-24 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | load_contents(): don't try to mmap an empty file | Michael Haggerty | 2018-01-24 | 1 | -7/+6 | |
| * | | | | | | | | | | | | | | | | | packed_ref_iterator_begin(): make optimization more general | Michael Haggerty | 2018-01-24 | 1 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | find_reference_location(): make function safe for empty snapshots | Michael Haggerty | 2018-01-24 | 1 | -4/+6 | |
| * | | | | | | | | | | | | | | | | | create_snapshot(): use `xmemdupz()` rather than a strbuf | Michael Haggerty | 2018-01-24 | 1 | -5/+4 | |
| * | | | | | | | | | | | | | | | | | struct snapshot: store `start` rather than `header_len` | Michael Haggerty | 2018-01-24 | 1 | -31/+33 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jt/fsck-code-cleanup' | Junio C Hamano | 2018-02-15 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | fsck: fix leak when traversing treesjt/fsck-code-cleanup | Eric Wong | 2018-01-23 | 1 | -1/+7 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'en/merge-recursive-fixes' | Junio C Hamano | 2018-02-15 | 3 | -4/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | merge-recursive: add explanation for src_entry and dst_entryen/merge-recursive-fixes | Elijah Newren | 2018-01-19 | 1 | -0/+19 | |
| * | | | | | | | | | | | | | | | | | | | merge-recursive: fix logic ordering issue | Elijah Newren | 2018-01-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | Tighten and correct a few testcases for merging and cherry-picking | Elijah Newren | 2018-01-19 | 2 | -3/+9 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/worktree-add-short-help' | Junio C Hamano | 2018-02-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | worktree: say that "add" takes an arbitrary commit in short-helpjc/worktree-add-short-help | Junio C Hamano | 2018-01-17 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/sha1dc-build' | Junio C Hamano | 2018-02-15 | 2 | -3/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |