summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs: update some more docs to use "oid" rather than "sha1"mh/tidy-ref-update-flagsMichael Haggerty2017-11-066-27/+26
* write_packed_entry(): take `object_id` argumentsMichael Haggerty2017-11-061-8/+8
* refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`Michael Haggerty2017-11-061-9/+9
* refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty2017-11-0612-40/+40
* refs: tidy up and adjust visibility of the `ref_update` flagsMichael Haggerty2017-11-063-80/+99
* ref_transaction_add_update(): remove a checkMichael Haggerty2017-11-062-4/+6
* ref_transaction_update(): die on disallowed flagsMichael Haggerty2017-11-061-1/+2
* prune_ref(): call `ref_transaction_add_update()` directlyMichael Haggerty2017-11-062-12/+17
* files_transaction_prepare(): don't leak flags to packed transactionMichael Haggerty2017-11-061-2/+2
* Merge branch 'bc/object-id' into baseMichael Haggerty2017-10-2870-554/+544
|\
| * refs/files-backend: convert static functions to object_idbrian m. carlson2017-10-161-28/+28
| * refs: convert read_raw_ref backends to struct object_idbrian m. carlson2017-10-164-17/+18
| * refs: convert peel_object to struct object_idbrian m. carlson2017-10-164-11/+11
| * refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson2017-10-169-38/+36
| * worktree: convert struct worktree to object_idbrian m. carlson2017-10-163-5/+5
| * refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-169-13/+13
| * Convert remaining callers of resolve_gitlink_ref to object_idbrian m. carlson2017-10-164-13/+13
| * sha1_file: convert index_path and index_fd to struct object_idbrian m. carlson2017-10-161-15/+15
| * refs: convert reflog_expire parameter to struct object_idbrian m. carlson2017-10-166-18/+15
| * refs: convert read_ref_at to struct object_idbrian m. carlson2017-10-164-21/+21
| * refs: convert peel_ref to struct object_idbrian m. carlson2017-10-167-17/+17
| * builtin/pack-objects: convert to struct object_idbrian m. carlson2017-10-161-67/+68
| * pack-bitmap: convert traverse_bitmap_commit_list to object_idbrian m. carlson2017-10-164-11/+11
| * refs: convert dwim_log to struct object_idbrian m. carlson2017-10-165-9/+9
| * builtin/reflog: convert remaining unsigned char uses to object_idbrian m. carlson2017-10-161-9/+9
| * refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-1615-24/+25
| * refs: convert read_ref and read_ref_full to object_idbrian m. carlson2017-10-1619-47/+46
| * refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-1612-20/+20
| * Convert check_connected to use struct object_idbrian m. carlson2017-10-165-20/+20
| * refs: update ref transactions to use struct object_idbrian m. carlson2017-10-1615-71/+69
| * refs: prevent accidental NULL dereference in write_pseudorefbrian m. carlson2017-10-161-0/+3
| * refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-1617-74/+65
| * refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson2017-10-169-25/+26
| * refs/files-backend: convert struct ref_to_prune to object_idbrian m. carlson2017-10-161-3/+3
| * walker: convert to struct object_idbrian m. carlson2017-10-161-12/+12
* | Hopefully final batch before 2.15Junio C Hamano2017-10-281-0/+7
* | Merge branch 'sg/rev-list-doc-reorder-fix'Junio C Hamano2017-10-281-3/+3
|\ \
| * | rev-list-options.txt: use correct directional referencesg/rev-list-doc-reorder-fixSZEDER Gábor2017-10-271-3/+3
* | | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-10-281-1/+1
|\ \ \
| * | | docs: fix formatting of rev-parse's --show-superproject-working-treesb/rev-parse-show-superproject-rootSebastian Schuberth2017-10-271-1/+1
* | | | Merge branch 'ao/path-use-xmalloc'Junio C Hamano2017-10-281-1/+1
|\ \ \ \
| * | | | path.c: use xmalloc() in add_to_trie()ao/path-use-xmallocAndrey Okoshkin2017-10-251-1/+1
* | | | | Merge branch 'np/config-path-doc'Junio C Hamano2017-10-281-4/+4
|\ \ \ \ \
| * | | | | config doc: clarify "git config --path" examplenp/config-path-docNathan Payre2017-10-191-4/+4
* | | | | | Merge branch 'mh/ref-locking-fix'Junio C Hamano2017-10-262-1/+142
|\ \ \ \ \ \
| * | | | | | files_transaction_prepare(): fix handling of ref lock failuremh/ref-locking-fixMichael Haggerty2017-10-252-9/+9
| * | | | | | t1404: add a bunch of tests of D/F conflictsMichael Haggerty2017-10-251-0/+141
* | | | | | | Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2017-10-2412-24768/+42782
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/gitJiang Xin2017-10-241-2414/+2557
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: zh_CN: review for git v2.15.0 l10n round 2Ray Chen2017-10-241-2/+2
View Lorry Controller Status