diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-10-14 21:49:45 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-10-14 21:49:45 +0400 |
commit | bd107e1052a11cf7dd6baf9077eab52fbb9d9c90 (patch) | |
tree | 8488a958144d162776be2fa557d291cb25ac0e6b /builtin/receive-pack.c | |
parent | 7543dea8b2a33e4a56b0fdd408bc47769238025e (diff) | |
parent | 697cc8efd944a32ca472337cd6640004c474b788 (diff) |
Merge branch 'mh/lockfile'
The lockfile API and its users have been cleaned up.
* mh/lockfile: (38 commits)
lockfile.h: extract new header file for the functions in lockfile.c
hold_locked_index(): move from lockfile.c to read-cache.c
hold_lock_file_for_append(): restore errno before returning
get_locked_file_path(): new function
lockfile.c: rename static functions
lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF
commit_lock_file_to(): refactor a helper out of commit_lock_file()
trim_last_path_component(): replace last_path_elm()
resolve_symlink(): take a strbuf parameter
resolve_symlink(): use a strbuf for internal scratch space
lockfile: change lock_file::filename into a strbuf
commit_lock_file(): use a strbuf to manage temporary space
try_merge_strategy(): use a statically-allocated lock_file object
try_merge_strategy(): remove redundant lock_file allocation
struct lock_file: declare some fields volatile
lockfile: avoid transitory invalid states
git_config_set_multivar_in_file(): avoid call to rollback_lock_file()
dump_marks(): remove a redundant call to rollback_lock_file()
api-lockfile: document edge cases
commit_lock_file(): rollback lock file on failure to rename
...
Diffstat (limited to 'builtin/receive-pack.c')
-rw-r--r-- | builtin/receive-pack.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index a01ac2096a..f2f6c67359 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "lockfile.h" #include "pack.h" #include "refs.h" #include "pkt-line.h" |