Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | refs_resolve_ref_unsafe: handle d/f conflicts for writesjk/refs-df-conflict | Jeff King | 2017-10-07 | 1 | -1/+14 |
* | Merge branch 'mh/mmap-packed-refs' | Junio C Hamano | 2017-10-03 | 1 | -1/+21 |
|\ | |||||
| * | ref_store: implement `refs_peel_ref()` generically | Michael Haggerty | 2017-09-25 | 1 | -1/+17 |
| * | ref_iterator: keep track of whether the iterator output is ordered | Michael Haggerty | 2017-09-14 | 1 | -0/+4 |
* | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-10-03 | 1 | -0/+11 |
|\ \ | |||||
| * | | branch: add a --copy (-c) option to go with --move (-m) | Sahil Dua | 2017-06-18 | 1 | -0/+11 |
* | | | Merge branch 'rs/resolve-ref-optional-result' | Junio C Hamano | 2017-09-28 | 1 | -4/+5 |
|\ \ \ | |||||
| * | | | refs: pass NULL to resolve_ref_unsafe() if hash is not needed | René Scharfe | 2017-09-24 | 1 | -4/+2 |
| * | | | refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional | René Scharfe | 2017-09-24 | 1 | -0/+3 |
* | | | | Merge branch 'tg/refs-allowed-flags' | Junio C Hamano | 2017-09-25 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | refs: strip out not allowed flags from ref_transaction_updatetg/refs-allowed-flags | Thomas Gummerer | 2017-09-14 | 1 | -0/+2 |
* | | | | | Merge branch 'jn/per-repo-object-store-fixes' | Junio C Hamano | 2017-09-25 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | replace-objects: evaluate replacement refs without using the object storejn/per-repo-object-store-fixes | Stefan Beller | 2017-09-14 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jk/write-in-full-fix' | Junio C Hamano | 2017-09-25 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | avoid "write_in_full(fd, buf, len) != len" pattern | Jeff King | 2017-09-14 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'cc/ref-is-hidden-microcleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -5/+4 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'rs/strbuf-leakfix' | Junio C Hamano | 2017-09-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | refs: release strbuf on error return in write_pseudoref() | Rene Scharfe | 2017-09-07 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'nd/prune-in-worktree' | Junio C Hamano | 2017-09-19 | 1 | -79/+31 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | refs.c: reindent get_submodule_ref_store()nd/prune-in-worktree | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -7/+5 |
| * | | | | refs.c: remove fallback-to-main-store code get_submodule_ref_store() | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -8/+3 |
| * | | | | refs: remove dead for_each_*_submodule() | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -33/+0 |
| * | | | | refs.c: move for_each_remote_ref_submodule() to submodule.c | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -6/+0 |
| * | | | | revision.c: use refs_for_each*() instead of for_each_*_submodule() | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -5/+4 |
| * | | | | refs: add refs_head_ref() | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -10/+13 |
| * | | | | refs: move submodule slash stripping code to get_submodule_ref_store | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -16/+17 |
| * | | | | refs.c: refactor get_submodule_ref_store(), share common free block | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -11/+6 |
| * | | | | refs.c: use is_dir_sep() in resolve_gitlink_ref() | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -1/+1 |
* | | | | | Merge branch 'mh/ref-lock-entry' | Junio C Hamano | 2017-08-26 | 1 | -3/+21 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | refs: retry acquiring reference locks for 100msmh/ref-lock-entry | Michael Haggerty | 2017-08-23 | 1 | -3/+21 |
| |/ / / | |||||
* | | | | Merge branch 'mh/packed-ref-store' | Junio C Hamano | 2017-08-22 | 1 | -0/+18 |
|\ \ \ \ | |||||
| * | | | | packed-backend: new module for handling packed references | Michael Haggerty | 2017-06-23 | 1 | -0/+18 |
* | | | | | Merge branch 'cc/ref-is-hidden-microcleanup' | Junio C Hamano | 2017-08-11 | 1 | -5/+4 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | refs: use skip_prefix() in ref_is_hidden()cc/ref-is-hidden-microcleanup | Christian Couder | 2017-07-24 | 1 | -5/+4 |
| * | | | | Merge branch 'jk/interpret-branch-name' into maint | Junio C Hamano | 2017-03-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/parse-config-key-cleanup' into maint | Junio C Hamano | 2017-03-28 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'bc/object-id' | Junio C Hamano | 2017-08-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | sha1_name: convert GET_SHA1* flags to GET_OID* | brian m. carlson | 2017-07-17 | 1 | -1/+1 |
* | | | | | | | Merge branch 'sb/hashmap-customize-comparison' | Junio C Hamano | 2017-07-13 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | hashmap.h: compare function has access to a data field | Stefan Beller | 2017-06-30 | 1 | -2/+3 |
* | | | | | | | Merge branch 'ab/wildmatch' | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | wildmatch: remove unused wildopts parameterab/wildmatch | Ævar Arnfjörð Bjarmason | 2017-06-23 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'mh/packed-ref-store-prep' | Junio C Hamano | 2017-06-26 | 1 | -0/+12 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | for_each_bisect_ref(): don't trim refnames | Michael Haggerty | 2017-06-18 | 1 | -0/+12 |
| |/ / / / | |||||
* | | | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
* | | | | | refs_ref_iterator_begin(): handle `GIT_REF_PARANOIA` | Michael Haggerty | 2017-05-23 | 1 | -0/+5 |
* | | | | | ref_update_reject_duplicates(): add a sanity check | Michael Haggerty | 2017-05-23 | 1 | -2/+8 |
* | | | | | ref_update_reject_duplicates(): use `size_t` rather than `int` | Michael Haggerty | 2017-05-23 | 1 | -1/+1 |
* | | | | | ref_update_reject_duplicates(): expose function to whole refs module | Michael Haggerty | 2017-05-23 | 1 | -0/+17 |