Skip to content
  • Junio C Hamano's avatar
    Merge branch 'mh/lockfile' · bd107e10
    Junio C Hamano authored
    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
      ...
    bd107e10