summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge branch 'rs/cocci-strbuf-addf-to-addstr'Junio C Hamano2018-02-151-16/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | cocci: simplify check for trivial format stringsrs/cocci-strbuf-addf-to-addstrRené Scharfe2018-02-021-16/+1
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/trace-index-ops'Junio C Hamano2018-02-155-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | trace: measure where the time is spent in the index-heavy operationsnd/trace-index-opsNguyễn Thái Ngọc Duy2018-02-025-0/+18
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'cc/perf-aggregate'Junio C Hamano2018-02-151-11/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | perf/aggregate: sort JSON fields in outputcc/perf-aggregateChristian Couder2018-02-021-1/+1
| * | | | | | | | | | | | | | | | perf/aggregate: add --reponame optionChristian Couder2018-02-021-2/+13
| * | | | | | | | | | | | | | | | perf/aggregate: add --subsection optionChristian Couder2018-02-021-9/+24
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ab/wildmatch-tests'Junio C Hamano2018-02-153-245/+416
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | wildmatch test: mark test as EXPENSIVE_ON_WINDOWSab/wildmatch-testsÆvar Arnfjörð Bjarmason2018-01-301-8/+8
| * | | | | | | | | | | | | | | | test-lib: add an EXPENSIVE_ON_WINDOWS prerequisiteÆvar Arnfjörð Bjarmason2018-01-301-0/+4
| * | | | | | | | | | | | | | | | wildmatch test: create & test files on disk in addition to in-memoryÆvar Arnfjörð Bjarmason2018-01-301-11/+190
| * | | | | | | | | | | | | | | | wildmatch test: perform all tests under all wildmatch() modesÆvar Arnfjörð Bjarmason2018-01-302-252/+228
| * | | | | | | | | | | | | | | | wildmatch test: use test_must_fail, not ! for test-wildmatchÆvar Arnfjörð Bjarmason2018-01-301-3/+3
| * | | | | | | | | | | | | | | | wildmatch test: remove dead fnmatch() test codeÆvar Arnfjörð Bjarmason2018-01-301-178/+178
| * | | | | | | | | | | | | | | | wildmatch test: use a paranoia pattern from nul_match()Ævar Arnfjörð Bjarmason2018-01-301-3/+12
| * | | | | | | | | | | | | | | | wildmatch test: don't try to vertically align our outputÆvar Arnfjörð Bjarmason2018-01-301-5/+5
| * | | | | | | | | | | | | | | | wildmatch test: use more standard shell styleÆvar Arnfjörð Bjarmason2018-01-301-3/+6
| * | | | | | | | | | | | | | | | wildmatch test: indent with tabs, not spacesÆvar Arnfjörð Bjarmason2018-01-301-27/+27
* | | | | | | | | | | | | | | | | Merge branch 'po/object-id'Junio C Hamano2018-02-1539-281/+302
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | sha1_file: rename hash_sha1_file_literallypo/object-idPatryk Obara2018-01-303-4/+8
| * | | | | | | | | | | | | | | | | sha1_file: convert write_loose_object to object_idPatryk Obara2018-01-301-12/+16
| * | | | | | | | | | | | | | | | | sha1_file: convert force_object_loose to object_idPatryk Obara2018-01-303-7/+8
| * | | | | | | | | | | | | | | | | sha1_file: convert write_sha1_file to object_idPatryk Obara2018-01-3018-58/+65
| * | | | | | | | | | | | | | | | | notes: convert write_notes_tree to object_idPatryk Obara2018-01-304-11/+13
| * | | | | | | | | | | | | | | | | notes: convert combine_notes_* to object_idPatryk Obara2018-01-302-33/+38
| * | | | | | | | | | | | | | | | | commit: convert commit_tree* to object_idPatryk Obara2018-01-3010-34/+36
| * | | | | | | | | | | | | | | | | match-trees: convert splice_tree to object_idPatryk Obara2018-01-301-24/+22
| * | | | | | | | | | | | | | | | | cache: clear whole hash buffer with oidclrPatryk Obara2018-01-301-1/+1
| * | | | | | | | | | | | | | | | | sha1_file: convert hash_sha1_file to object_idPatryk Obara2018-01-3011-35/+36
| * | | | | | | | | | | | | | | | | dir: convert struct sha1_stat to use object_idPatryk Obara2018-01-304-64/+58
| * | | | | | | | | | | | | | | | | sha1_file: convert pretend_sha1_file to object_idPatryk Obara2018-01-304-8/+11
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2018-02-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | builtin/pull: respect verbosity settings in submodulessb/pull-rebase-submoduleStefan Beller2018-01-251-0/+2
* | | | | | | | | | | | | | | | | | Merge branch 'kg/packed-ref-cache-fix'Junio C Hamano2018-02-151-51/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | packed_ref_cache: don't use mmap() for small fileskg/packed-ref-cache-fixKim Gybels2018-01-241-1/+3
| * | | | | | | | | | | | | | | | | | load_contents(): don't try to mmap an empty fileMichael Haggerty2018-01-241-7/+6
| * | | | | | | | | | | | | | | | | | packed_ref_iterator_begin(): make optimization more generalMichael Haggerty2018-01-241-6/+6
| * | | | | | | | | | | | | | | | | | find_reference_location(): make function safe for empty snapshotsMichael Haggerty2018-01-241-4/+6
| * | | | | | | | | | | | | | | | | | create_snapshot(): use `xmemdupz()` rather than a strbufMichael Haggerty2018-01-241-5/+4
| * | | | | | | | | | | | | | | | | | struct snapshot: store `start` rather than `header_len`Michael Haggerty2018-01-241-31/+33
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jt/fsck-code-cleanup'Junio C Hamano2018-02-151-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fsck: fix leak when traversing treesjt/fsck-code-cleanupEric Wong2018-01-231-1/+7
* | | | | | | | | | | | | | | | | | | Merge branch 'en/merge-recursive-fixes'Junio C Hamano2018-02-153-4/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | merge-recursive: add explanation for src_entry and dst_entryen/merge-recursive-fixesElijah Newren2018-01-191-0/+19
| * | | | | | | | | | | | | | | | | | | merge-recursive: fix logic ordering issueElijah Newren2018-01-191-1/+1
| * | | | | | | | | | | | | | | | | | | Tighten and correct a few testcases for merging and cherry-pickingElijah Newren2018-01-192-3/+9
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/worktree-add-short-help'Junio C Hamano2018-02-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | worktree: say that "add" takes an arbitrary commit in short-helpjc/worktree-add-short-helpJunio C Hamano2018-01-171-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/sha1dc-build'Junio C Hamano2018-02-152-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \