diff options
| author | Stephen R. van den Berg <srb@cuci.nl> | 2008-04-27 19:32:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-29 17:47:37 -0700 |
| commit | d9c292e8bbd51c84cb9ecd86cb89b8a1b35a2a82 (patch) | |
| tree | 43b2a394017dba66ca78ad2d8ead7e94cde9a4c5 /cache-tree.h | |
| parent | f0ec47b8e7f46e17e6b6fe1cead728fa24477e43 (diff) | |
| download | git-d9c292e8bbd51c84cb9ecd86cb89b8a1b35a2a82.tar.gz | |
Simplify and fix --first-parent implementation
The purpose of --first-parent is to view the tree without looking at
side branche. This is accomplished by pretending there are no other
parents than the first parent when encountering a merge.
The current code marks the other parents as seen, which means that the tree
traversal will behave differently depending on the order merges are handled.
When a fast forward is artificially recorded as a merge,
-----
/ \
D---E---F---G master
the current first-parent code considers E to be seen and stops the
traversal after showing G and F.
Signed-off-by: Stephen R. van den Berg <srb@cuci.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.h')
0 files changed, 0 insertions, 0 deletions