diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:40 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:40 -0700 |
commit | 8eaf517835d0534767d6a54d12d072ce30276ad9 (patch) | |
tree | 19368a64c5b367f601fb6ddd77d4c6e903a2df10 /compat/vcbuild | |
parent | f008cef4abb2a4db766b4a152b304aca91a0101a (diff) | |
parent | 22f4c27e68f448d5fce316a73ea3f7bab6aa1268 (diff) | |
download | git-8eaf517835d0534767d6a54d12d072ce30276ad9.tar.gz git-8eaf517835d0534767d6a54d12d072ce30276ad9.tar.xz |
Merge branch 'ks/tree-diff-nway'
Instead of running N pair-wise diff-trees when inspecting a
N-parent merge, find the set of paths that were touched by walking
N+1 trees in parallel. These set of paths can then be turned into
N pair-wise diff-tree results to be processed through rename
detections and such. And N=2 case nicely degenerates to the usual
2-way diff-tree, which is very nice.
* ks/tree-diff-nway:
mingw: activate alloca
combine-diff: speed it up, by using multiparent diff tree-walker directly
tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
Portable alloca for Git
tree-diff: reuse base str(buf) memory on sub-tree recursion
tree-diff: no need to call "full" diff_tree_sha1 from show_path()
tree-diff: rework diff_tree interface to be sha1 based
tree-diff: diff_tree() should now be static
tree-diff: remove special-case diff-emitting code for empty-tree cases
tree-diff: simplify tree_entry_pathcmp
tree-diff: show_path prototype is not needed anymore
tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
tree-diff: move all action-taking code out of compare_tree_entry()
tree-diff: don't assume compare_tree_entry() returns -1,0,1
tree-diff: consolidate code for emitting diffs and recursion in one place
tree-diff: show_tree() is not needed
tree-diff: no need to pass match to skip_uninteresting()
tree-diff: no need to manually verify that there is no mode change for a path
combine-diff: move changed-paths scanning logic into its own function
combine-diff: move show_log_first logic/action out of paths scanning
Diffstat (limited to 'compat/vcbuild')
-rw-r--r-- | compat/vcbuild/include/alloca.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compat/vcbuild/include/alloca.h b/compat/vcbuild/include/alloca.h deleted file mode 100644 index c0d7985b7..000000000 --- a/compat/vcbuild/include/alloca.h +++ /dev/null @@ -1 +0,0 @@ -#include <malloc.h> |