Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Oct 1, 2014
  1. @mhagger @gitster

    lockfile.h: extract new header file for the functions in lockfile.c

    mhagger authored gitster committed
    Move the interface declaration for the functions in lockfile.c from
    cache.h to a new file, lockfile.h. Add #includes where necessary (and
    remove some redundant includes of cache.h by files that already
    include builtin.h).
    Move the documentation of the lock_file state diagram from lockfile.c
    to the new header file.
    Signed-off-by: Michael Haggerty <>
    Signed-off-by: Junio C Hamano <>
Commits on Jul 16, 2014
  1. @gitster

    Merge branch 'nd/split-index'

    gitster authored
    An experiment to use two files (the base file and incremental
    changes relative to it) to represent the index to reduce I/O cost
    of rewriting a large index when only small part of the working tree
    * nd/split-index: (32 commits)
      t1700: new tests for split-index mode
      t2104: make sure split index mode is off for the version test
      read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
      read-tree: note about dropping split-index mode or index version
      read-tree: force split-index mode off on --index-output
      rev-parse: add --shared-index-path to get shared index path
      update-index --split-index: do not split if $GIT_DIR is read only
      update-index: new options to enable/disable split index mode
      split-index: strip pathname of on-disk replaced entries
      split-index: do not invalidate cache-tree at read time
      split-index: the reading part
      split-index: the writing part
      read-cache: mark updated entries for split index
      read-cache: save deleted entries in split index
      read-cache: mark new entries for split index
      read-cache: split-index mode
      read-cache: save index SHA-1 after reading
      entry.c: update cache_changed if refresh_cache is set in checkout_entry()
      cache-tree: mark istate->cache_changed on prime_cache_tree()
      cache-tree: mark istate->cache_changed on cache tree update
Commits on Jun 19, 2014
  1. @peff @gitster

    merge: use argv_array when spawning merge strategy

    peff authored gitster committed
    This is shorter, and avoids a rather complicated set of
    allocation and free steps.
    Signed-off-by: Jeff King <>
    Signed-off-by: Junio C Hamano <>
Commits on Jun 13, 2014
  1. @pclouds @gitster

    read-cache: new API write_locked_index instead of write_index/write_c…

    pclouds authored gitster committed
    Signed-off-by: Nguyễn Thái Ngọc Duy <>
    Signed-off-by: Junio C Hamano <>
Commits on Oct 29, 2012
  1. @pclouds @peff

    Move try_merge_command and checkout_fast_forward to libgit.a

    pclouds authored peff committed
    These functions are called in sequencer.c, which is part of
    libgit.a. This makes libgit.a potentially require builtin/merge.c for
    external git commands.
    Signed-off-by: Nguyễn Thái Ngọc Duy <>
    Signed-off-by: Jeff King <>
Something went wrong with that request. Please try again.