summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-17 13:25:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-17 13:25:20 -0700
commit25ab004c53cdcfea485e5bf437aeaa74df47196d (patch)
tree3d697166144f66978d47bbd2d50c00d385fc4c36 /builtin/merge-recursive.c
parentMerge branch 'jk/alt-odb-cleanup' (diff)
parenttmp-objdir: do not migrate files starting with '.' (diff)
downloadtgif-25ab004c53cdcfea485e5bf437aeaa74df47196d.tar.xz
Merge branch 'jk/quarantine-received-objects'
In order for the receiving end of "git push" to inspect the received history and decide to reject the push, the objects sent from the sending end need to be made available to the hook and the mechanism for the connectivity check, and this was done traditionally by storing the objects in the receiving repository and letting "git gc" to expire it. Instead, store the newly received objects in a temporary area, and make them available by reusing the alternate object store mechanism to them only while we decide if we accept the check, and once we decide, either migrate them to the repository or purge them immediately. * jk/quarantine-received-objects: tmp-objdir: do not migrate files starting with '.' tmp-objdir: put quarantine information in the environment receive-pack: quarantine objects until pre-receive accepts tmp-objdir: introduce API for temporary object directories check_connected: accept an env argument
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions