summaryrefslogtreecommitdiff
path: root/t/t3031-merge-criscross.sh
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@linux-foundation.org>2009-06-02 18:34:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-03 00:49:50 -0700
commitceff8e7adeed51024491deb4933f23db760e5641 (patch)
treec98b5de12111a6767b45f8e9f5f65ef7d1bb7299 /t/t3031-merge-criscross.sh
parentMerge branch 'maint' (diff)
downloadtgif-ceff8e7adeed51024491deb4933f23db760e5641.tar.xz
Clean up and simplify rev_compare_tree()
This simplifies the logic of rev_compare_tree() by removing a special case. It does so by turning the special case of finding a diff to be "all new files" into a more generic case of "all new" vs "all removed" vs "mixed changes", so now the code is actually more powerful and more generic, and the added symmetry actually makes it simpler too. This makes no changes to any existing behavior, but apart from the simplification it does make it possible to some day care about whether all changes were just deletions if we want to. Which we may well want to for merge handling. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3031-merge-criscross.sh')
0 files changed, 0 insertions, 0 deletions