summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-25 15:17:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-25 15:17:15 -0700
commitedc2f715bd2d18566045ed1e8eadd808cedd2903 (patch)
treee9676acb2e52e13420fae15cfbf88ae5846528a1 /git-merge-octopus.sh
parentMerge branch 'jc/rerere-multi' (diff)
parentrefs: on symref reflog expire, lock symref not referrent (diff)
downloadtgif-edc2f715bd2d18566045ed1e8eadd808cedd2903.tar.xz
Merge branch 'dt/pre-refs-backend'
Code restructuring around the "refs" area to prepare for pluggable refs backends. * dt/pre-refs-backend: (24 commits) refs: on symref reflog expire, lock symref not referrent refs: move resolve_ref_unsafe into common code show_head_ref(): check the result of resolve_ref_namespace() check_aliased_update(): check that dst_name is non-NULL checkout_paths(): remove unneeded flag variable cmd_merge(): remove unneeded flag variable fsck_head_link(): remove unneeded flag variable read_raw_ref(): change flags parameter to unsigned int files-backend: inline resolve_ref_1() into resolve_ref_unsafe() read_raw_ref(): manage own scratch space files-backend: break out ref reading resolve_ref_1(): eliminate local variable "bad_name" resolve_ref_1(): reorder code resolve_ref_1(): eliminate local variable resolve_ref_unsafe(): ensure flags is always set resolve_ref_unsafe(): use for loop to count up to MAXDEPTH resolve_missing_loose_ref(): simplify semantics t1430: improve test coverage of deletion of badly-named refs t1430: test for-each-ref in the presence of badly-named refs t1430: don't rely on symbolic-ref for creating broken symrefs ...
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions