Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/cleanup-strbuf-users' | Junio C Hamano | 2017-10-05 | 5 | -12/+8 |
|\ | |||||
| * | graph: use strbuf_addchars() to add spaces | René Scharfe | 2017-10-02 | 1 | -7/+3 |
| * | use strbuf_addstr() for adding strings to strbufs | René Scharfe | 2017-10-02 | 3 | -4/+4 |
| * | path: use strbuf_add_real_path() | René Scharfe | 2017-10-02 | 1 | -1/+1 |
* | | Merge branch 'rs/resolve-ref-optional-result' | Junio C Hamano | 2017-10-05 | 7 | -20/+9 |
|\ \ | |||||
| * | | refs: pass NULL to resolve_refdup() if hash is not needed | René Scharfe | 2017-10-01 | 6 | -18/+8 |
| * | | refs: pass NULL to refs_resolve_refdup() if hash is not needed | René Scharfe | 2017-10-01 | 1 | -2/+1 |
* | | | Merge branch 'er/fast-import-dump-refs-on-checkpoint' | Junio C Hamano | 2017-10-05 | 2 | -3/+145 |
|\ \ \ | |||||
| * | | | fast-import: checkpoint: dump branches/tags/marks even if object_count==0 | Eric Rannaud | 2017-09-29 | 2 | -3/+145 |
* | | | | The twelfth batch for 2.15 | Junio C Hamano | 2017-10-03 | 1 | -0/+24 |
* | | | | Merge branch 'bw/git-clang-format' | Junio C Hamano | 2017-10-03 | 1 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | clang-format: adjust line break penalties | Johannes Schindelin | 2017-10-01 | 1 | -6/+6 |
* | | | | | Merge branch 'ad/doc-markup-fix' | Junio C Hamano | 2017-10-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | doc: correct command formatting | Adam Dinwoodie | 2017-09-29 | 1 | -1/+1 |
* | | | | | | Merge branch 'mh/mmap-packed-refs' | Junio C Hamano | 2017-10-03 | 9 | -369/+848 |
|\ \ \ \ \ \ | |||||
| * | | | | | | packed-backend.c: rename a bunch of things and update comments | Michael Haggerty | 2017-09-25 | 1 | -190/+232 |
| * | | | | | | mmapped_ref_iterator: inline into `packed_ref_iterator` | Michael Haggerty | 2017-09-25 | 1 | -170/+114 |
| * | | | | | | ref_cache: remove support for storing peeled values | Michael Haggerty | 2017-09-25 | 3 | -72/+11 |
| * | | | | | | packed_ref_store: get rid of the `ref_cache` entirely | Michael Haggerty | 2017-09-25 | 1 | -27/+2 |
| * | | | | | | ref_store: implement `refs_peel_ref()` generically | Michael Haggerty | 2017-09-25 | 4 | -78/+17 |
| * | | | | | | packed_read_raw_ref(): read the reference from the mmapped buffer | Michael Haggerty | 2017-09-25 | 1 | -5/+9 |
| * | | | | | | packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator` | Michael Haggerty | 2017-09-25 | 1 | -3/+106 |
| * | | | | | | read_packed_refs(): ensure that references are ordered when read | Michael Haggerty | 2017-09-25 | 1 | -11/+212 |
| * | | | | | | packed_ref_cache: keep the `packed-refs` file mmapped if possible | Michael Haggerty | 2017-09-25 | 3 | -42/+152 |
| * | | | | | | packed-backend.c: reorder some definitions | Michael Haggerty | 2017-09-25 | 1 | -24/+24 |
| * | | | | | | mmapped_ref_iterator_advance(): no peeled value for broken refs | Michael Haggerty | 2017-09-25 | 1 | -2/+8 |
| * | | | | | | mmapped_ref_iterator: add iterator over a packed-refs file | Michael Haggerty | 2017-09-25 | 1 | -55/+152 |
| * | | | | | | packed_ref_cache: remember the file-wide peeling state | Michael Haggerty | 2017-09-25 | 1 | -5/+12 |
| * | | | | | | read_packed_refs(): read references with minimal copying | Michael Haggerty | 2017-09-25 | 1 | -61/+40 |
| * | | | | | | read_packed_refs(): make parsing of the header line more robust | Michael Haggerty | 2017-09-14 | 1 | -6/+15 |
| * | | | | | | read_packed_refs(): only check for a header at the top of the file | Michael Haggerty | 2017-09-14 | 1 | -11/+24 |
| * | | | | | | read_packed_refs(): use mmap to read the `packed-refs` file | Michael Haggerty | 2017-09-14 | 1 | -10/+32 |
| * | | | | | | die_unterminated_line(), die_invalid_line(): new functions | Michael Haggerty | 2017-09-14 | 1 | -3/+25 |
| * | | | | | | packed_ref_cache: add a backlink to the associated `packed_ref_store` | Michael Haggerty | 2017-09-14 | 1 | -7/+16 |
| * | | | | | | prefix_ref_iterator: break when we leave the prefix | Jeff King | 2017-09-14 | 1 | -1/+31 |
| * | | | | | | ref_iterator: keep track of whether the iterator output is ordered | Michael Haggerty | 2017-09-14 | 7 | -19/+46 |
* | | | | | | | Merge branch 'mr/doc-negative-pathspec' | Junio C Hamano | 2017-10-03 | 5 | -2/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | docs: improve discoverability of exclude pathspec | Manav Rathi | 2017-09-25 | 5 | -2/+24 |
* | | | | | | | | Merge branch 'sb/submodule-diff-header-fix' | Junio C Hamano | 2017-10-03 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule: correct error message for missing commits | Stefan Beller | 2017-09-28 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-10-03 | 7 | -0/+35 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff: correct newline in summary for renamed files | Stefan Beller | 2017-09-28 | 7 | -0/+35 |
* | | | | | | | | | | Merge branch 'sb/test-submodule-update-config' | Junio C Hamano | 2017-10-03 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t7406: submodule.<name>.update command must not be run from .gitmodules | Stefan Beller | 2017-09-27 | 1 | -0/+8 |
* | | | | | | | | | | | Merge branch 'jk/validate-headref-fix' | Junio C Hamano | 2017-10-03 | 1 | -11/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | validate_headref: use get_oid_hex for detached HEADs | Jeff King | 2017-09-27 | 1 | -2/+2 |
| * | | | | | | | | | | | validate_headref: use skip_prefix for symref parsing | Jeff King | 2017-09-27 | 1 | -9/+6 |
| * | | | | | | | | | | | validate_headref: NUL-terminate HEAD buffer | Jeff King | 2017-09-27 | 1 | -0/+4 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/read-in-full' | Junio C Hamano | 2017-10-03 | 10 | -17/+55 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | worktree: check the result of read_in_full() | Jeff King | 2017-09-27 | 1 | -1/+18 |