All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Marco Costalba <mcostalba@gmail.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] Fix "git log --parent -m" from emitting duplicated parent info
Date: Sun, 08 Jul 2007 18:28:08 -0700	[thread overview]
Message-ID: <7vwsxaxt5j.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0707090214280.4248@racer.site> (Johannes Schindelin's message of "Mon, 9 Jul 2007 02:15:11 +0100 (BST)")

Sorry, not 88494239 but this one.

commit 884944239f2ab673cedfaa5e7999d31fd6a46331
Author: Junio C Hamano <junkio@cox.net>
Date:   Sun Jan 29 15:24:42 2006 -0800

    rev-list: omit duplicated parents.
    
    Showing the same parent more than once for a commit does not
    make much sense downstream, so stop it.
    
    This can happen with an incorrectly made merge commit that
    merges the same parent twice, but can happen in an otherwise
    sane development history while squishing the history by taking
    into account only commits that touch specified paths.
    
    For example,
    
    	$ git rev-list --max-count=1 --parents addafaf -- rev-list.c
    
    would have to show this commit ancestry graph:
    
                      .---o---.
                     /         \
                    .---*---o---.
                   /    93b74bc  \
       ---*---o---o-----o---o-----o addafaf
          d8f6b34  \             /
                    .---o---o---.
                     \         /
                      .---*---.
                          3815f42
    
    where 5 independent development tracks, only two of which have
    changes in the specified paths since they forked.  The last
    change for the other three development tracks was done by the
    same commit before they forked, and we were showing that three
    times.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>

  reply	other threads:[~2007-07-09  1:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-08 14:37 [PATCH] Fix "git log --parent -m" from emitting duplicated parent info Marco Costalba
2007-07-08 18:32 ` Junio C Hamano
2007-07-09  0:37 ` Junio C Hamano
2007-07-09  1:15   ` Johannes Schindelin
2007-07-09  1:28     ` Junio C Hamano [this message]
2007-07-09  1:20   ` Junio C Hamano
2007-07-09  1:22   ` Johannes Schindelin
2007-07-09  1:38     ` Junio C Hamano
2007-07-09  5:46       ` Marco Costalba
2007-07-09  6:19         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vwsxaxt5j.fsf@assigned-by-dhcp.cox.net \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=mcostalba@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.