[PATCH 0/3] rev-list --simplify-{merges,by-decoration} --first-parent

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


The deeper history simplification using merge information (not to be
confused with "merge simplification") was not prepared to be used
with the --first-parent option, but it was possible to trigger this
combination from gitk.

The fix is fairly straight-forward.  When showing only first-parent
chain of history, the later parents won't matter in the result, so
we can just rewrite the parents and make the history a single strand
of pearls.

Showing first-parent-only history and then attempting to simplify
merges does not make much sense, but simplify-by-decoration may be a
valid thing to ask.

Junio C Hamano (3):
  revision: "simplify" options imply topo-order sort
  revision: note the lack of free() in simplify_merges()
  revision: cull side parents before running simplify-merges

 revision.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

-- 
1.7.11.rc2.29.g85b30f3

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Newbies FAQ]     [Linux Kernel Development]     [Free Online Dating]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Free Online Dating]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]     [Linux Resources]

Add to Google