user/sven/git.git/diff-lib.c, branch v1.7.7.4

Merge branch 'cn/eradicate-working-copy' into maint

2011-10-26T23:13:31Z

* cn/eradicate-working-copy: Remove 'working copy' from the documentation and C code

Merge branch 'jc/diff-index-unpack' into maint

2011-10-16T03:46:36Z

* jc/diff-index-unpack: diff-index: pass pathspec down to unpack-trees machinery unpack-trees: allow pruning with pathspec traverse_trees(): allow pruning with pathspec

Remove 'working copy' from the documentation and C code

2011-09-21T21:26:38Z

The git term is 'working tree', so replace the most public references to 'working copy'. Signed-off-by: Carlos Martín Nieto Signed-off-by: Junio C Hamano

diff-index: pass pathspec down to unpack-trees machinery

2011-08-29T22:09:17Z

And finally, pass the pathspec down through unpack_trees() to traverse_trees() callchain. Before and after applying this series, looking for changes in the kernel repository with a fairly narrow pathspec becomes somewhat faster. (without patch) $ /usr/bin/time git diff --raw v2.6.27 -- net/ipv6 >/dev/null 0.48user 0.05system 0:00.53elapsed 100%CPU (0avgtext+0avgdata 163296maxresident)k 0inputs+952outputs (0major+11163minor)pagefaults 0swaps (with patch) $ /usr/bin/time git diff --raw v2.6.27 -- net/ipv6 >/dev/null 0.01user 0.00system 0:00.02elapsed 104%CPU (0avgtext+0avgdata 43856maxresident)k 0inputs+24outputs (0major+3688minor)pagefaults 0swaps Signed-off-by: Junio C Hamano

Merge branch 'jc/diff-index-refactor'

2011-08-08T19:33:33Z

* jc/diff-index-refactor: diff-lib: refactor run_diff_index() and do_diff_cache() diff-lib: simplify do_diff_cache()

Merge branch 'jc/maint-reset-unmerged-path'

2011-08-01T22:00:08Z

* jc/maint-reset-unmerged-path: reset [] paths...: do not mishandle unmerged paths

diff-lib: refactor run_diff_index() and do_diff_cache()

2011-07-14T04:58:21Z

The latter is meant to be an API for internal callers that want to inspect the resulting diff-queue, while the former is an implementation of "git diff-index" command. Extract the common logic into a single helper function and make them thin wrappers around it. Signed-off-by: Junio C Hamano

diff-lib: simplify do_diff_cache()

2011-07-14T04:58:15Z

Since 34110cd (Make 'unpack_trees()' have a separate source and destination index, 2008-03-06), we can run unpack_trees() without munging the index at all, but do_diff_cache() tried ever so carefully to work around the old behaviour of the function. We can just tell unpack_trees() not to touch the original index and there is no need to clean-up whatever the previous round has done. Signed-off-by: Junio C Hamano

reset [] paths...: do not mishandle unmerged paths

2011-07-14T04:39:18Z

Because "diff --cached HEAD" showed an incorrect blob object name on the LHS of the diff, we ended up updating the index entry with bogus value, not what we read from the tree. Noticed by John Nowak. Signed-off-by: Junio C Hamano

Merge branch 'jk/diff-not-so-quick'

2011-06-06T18:40:14Z

* jk/diff-not-so-quick: diff: futureproof "stop feeding the backend early" logic diff_tree: disable QUICK optimization with diff filter Conflicts: diff.c