summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-25 21:57:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-25 21:57:09 (GMT)
commitdb86e61cbbc4c59a0886366bbf392498e64b53c8 (patch)
tree8b92645b8adeddaf02caa483579c64dbc09370fe /builtin/pull.c
parent424f89f098a045785471cccb4f7307cc5b05bc54 (diff)
parent9e9033166b3a6b34aad917891b9210fa194fdfd9 (diff)
downloadgit-db86e61cbbc4c59a0886366bbf392498e64b53c8.zip
git-db86e61cbbc4c59a0886366bbf392498e64b53c8.tar.gz
git-db86e61cbbc4c59a0886366bbf392498e64b53c8.tar.bz2
Merge branch 'mh/tempfile'
The "lockfile" API has been rebuilt on top of a new "tempfile" API. * mh/tempfile: credential-cache--daemon: use tempfile module credential-cache--daemon: delete socket from main() gc: use tempfile module to handle gc.pid file lock_repo_for_gc(): compute the path to "gc.pid" only once diff: use tempfile module setup_temporary_shallow(): use tempfile module write_shared_index(): use tempfile module register_tempfile(): new function to handle an existing temporary file tempfile: add several functions for creating temporary files prepare_tempfile_object(): new function, extracted from create_tempfile() tempfile: a new module for handling temporary files commit_lock_file(): use get_locked_file_path() lockfile: add accessor get_lock_file_path() lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() create_bundle(): duplicate file descriptor to avoid closing it twice lockfile: move documentation to lockfile.h and lockfile.c
Diffstat (limited to 'builtin/pull.c')
-rw-r--r--builtin/pull.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index b7bc1ff..7e3c11e 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -15,6 +15,7 @@
#include "dir.h"
#include "refs.h"
#include "revision.h"
+#include "tempfile.h"
#include "lockfile.h"
enum rebase_type {