delta/git.git/merge.c, branch va/i18n-misc-updates

Convert struct object to object_id

2015-11-20T13:02:05+00:00

struct object is one of the major data structures dealing with object
IDs.  Convert it to use struct object_id instead of an unsigned char
array.  Convert get_object_hash to refer to the new member as well.

Signed-off-by: brian m. carlson 
Signed-off-by: Jeff King

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

2014-10-01T20:56:14+00:00

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

Merge branch 'nd/split-index'

2014-07-16T18:25:40+00:00

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
changes.

* 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
  ...

merge: use argv_array when spawning merge strategy

2014-06-19T22:20:55+00:00

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

read-cache: new API write_locked_index instead of write_index/write_cache

2014-06-13T18:49:10+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Move try_merge_command and checkout_fast_forward to libgit.a

2012-10-29T07:08:30+00:00

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