Code

Merge branch 'nd/sparse'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jan 2010 19:58:34 +0000 (11:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jan 2010 19:58:34 +0000 (11:58 -0800)
commit73d66323ac78c750ba42fef23b1cb8fd2110e023
treec8df437709d52baabf3c05b0b40c8ea3fa61e606
parent054d2fa05cf0bc55fe1556c9e87d58d67a144f44
parent8740773ee5ef450cefd03d3576f348fe65e92edf
Merge branch 'nd/sparse'

* nd/sparse: (25 commits)
  t7002: test for not using external grep on skip-worktree paths
  t7002: set test prerequisite "external-grep" if supported
  grep: do not do external grep on skip-worktree entries
  commit: correctly respect skip-worktree bit
  ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
  tests: rename duplicate t1009
  sparse checkout: inhibit empty worktree
  Add tests for sparse checkout
  read-tree: add --no-sparse-checkout to disable sparse checkout support
  unpack-trees(): ignore worktree check outside checkout area
  unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
  unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
  unpack-trees.c: generalize verify_* functions
  unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
  Introduce "sparse checkout"
  dir.c: export excluded_1() and add_excludes_from_file_1()
  excluded_1(): support exclude files in index
  unpack-trees(): carry skip-worktree bit over in merged_entry()
  Read .gitignore from index if it is skip-worktree
  Avoid writing to buffer in add_excludes_from_file_1()
  ...

Conflicts:
.gitignore
Documentation/config.txt
Documentation/git-update-index.txt
Makefile
entry.c
t/t7002-grep.sh
25 files changed:
.gitignore
Documentation/config.txt
Documentation/git-ls-files.txt
Documentation/git-read-tree.txt
Documentation/git-update-index.txt
Makefile
builtin-apply.c
builtin-clean.c
builtin-commit.c
builtin-grep.c
builtin-ls-files.c
builtin-read-tree.c
builtin-update-index.c
cache.h
config.c
diff-lib.c
diff.c
dir.c
dir.h
entry.c
environment.c
read-cache.c
t/t7002-grep.sh
t/t7300-clean.sh
unpack-trees.c