From: Stephen R. van den Berg Date: Sun, 27 Apr 2008 17:32:46 +0000 (+0200) Subject: Simplify and fix --first-parent implementation X-Git-Tag: v1.5.6-rc0~32^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d9c292e8bbd51c84cb9ecd86cb89b8a1b35a2a82?hp=d9c292e8bbd51c84cb9ecd86cb89b8a1b35a2a82 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 Signed-off-by: Junio C Hamano ---