summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-17 20:25:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-17 20:25:20 (GMT)
commit25ab004c53cdcfea485e5bf437aeaa74df47196d (patch)
tree3d697166144f66978d47bbd2d50c00d385fc4c36 /Makefile
parentdec040192fde87fb3249a3d53f802decd84fa7b7 (diff)
parent62fe0eb4804c297486a1d421a4f893865fcbc911 (diff)
downloadgit-25ab004c53cdcfea485e5bf437aeaa74df47196d.zip
git-25ab004c53cdcfea485e5bf437aeaa74df47196d.tar.gz
git-25ab004c53cdcfea485e5bf437aeaa74df47196d.tar.bz2
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 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d15bf8d..9d6c245 100644
--- a/Makefile
+++ b/Makefile
@@ -832,6 +832,7 @@ LIB_OBJS += submodule-config.o
LIB_OBJS += symlinks.o
LIB_OBJS += tag.o
LIB_OBJS += tempfile.o
+LIB_OBJS += tmp-objdir.o
LIB_OBJS += trace.o
LIB_OBJS += trailer.o
LIB_OBJS += transport.o