diff options
author | Jeff King <peff@peff.net> | 2018-03-21 01:49:26 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-21 10:24:19 -0700 |
commit | 7ce2f4ca0e35a987fb29d11ae06438a93fd48873 (patch) | |
tree | 9df5250709b9b2b2f3487b9fc7264afd125d352b /cache-tree.h | |
parent | diff-highlight: prefer "echo" to "cat" in tests (diff) | |
download | tgif-7ce2f4ca0e35a987fb29d11ae06438a93fd48873.tar.xz |
diff-highlight: test interleaved parallel lines of history
The graph test in t9400 covers the case of two simultaneous
branches, but all of the commits during this time are on the
right-hand branch. So we test a graph structure like:
| |
| * commit ...
| |
but we never see the reverse, a commit on the left-hand
branch:
| |
* | commit ...
| |
Since this is an easy thing to get wrong when touching the
graph-matching code, let's cover it by adding one more
commit with its timestamp interleaved with the other branch.
Note that we need to pass --date-order to convince Git to
show it this way (since --topo-order tries to keep lines of
history separate).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.h')
0 files changed, 0 insertions, 0 deletions