From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: Bizarre missing changes (git bug?) Date: Wed, 30 Jul 2008 17:15:23 -0700 Message-ID: <7vabfy52p0.fsf@gitster.siamese.dyndns.org> References: <8502DF7C-5303-49E8-8C67-F837343E2F0C@gmail.com> <200807260512.40088.zippel@linux-m68k.org> <46a038f90807282015m7ce3da10h71dfee221c960332@mail.gmail.com> <7vej5b3ozz.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Roman Zippel , Martin Langhoff , Tim Harper , git@vger.kernel.org To: Linus Torvalds X-From: git-owner@vger.kernel.org Thu Jul 31 02:17:11 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KOLqq-0007CD-2L for gcvg-git-2@gmane.org; Thu, 31 Jul 2008 02:17:04 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762885AbYGaAPg (ORCPT ); Wed, 30 Jul 2008 20:15:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762879AbYGaAPf (ORCPT ); Wed, 30 Jul 2008 20:15:35 -0400 Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:40555 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762739AbYGaAPd (ORCPT ); Wed, 30 Jul 2008 20:15:33 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTP id D473D438B2; Wed, 30 Jul 2008 20:15:31 -0400 (EDT) Received: from pobox.com (ip68-225-240-211.oc.oc.cox.net [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 6F26B438B1; Wed, 30 Jul 2008 20:15:25 -0400 (EDT) In-Reply-To: <7vej5b3ozz.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 30 Jul 2008 16:56:32 -0700") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: C9BB1D8A-5E95-11DD-B1B0-3113EBD4C077-77302942!a-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano writes: > The idea is to compute, for each commit in the "full history" result set, > the commit that should replace it in the simplified history. This > replacement commit is defined as follows: > > * In any case, we first figure out the replacement commits of parents of > the commit we are looking at. The commit we are looking at is > rewritten as if its parents are replacement commits of its original > parents. > > * If the commit is marked as TREESAME (i.e. it modifies the paths we are > interested in), then the replacement commit is itself. IOW, the commit > is not dropped from the final result. A typo here. This comment should have said !TREESAME (the code is correct).