From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759840AbXGBOhm (ORCPT ); Mon, 2 Jul 2007 10:37:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755398AbXGBOhe (ORCPT ); Mon, 2 Jul 2007 10:37:34 -0400 Received: from srv5.dvmed.net ([207.36.208.214]:52204 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754314AbXGBOhc (ORCPT ); Mon, 2 Jul 2007 10:37:32 -0400 Message-ID: <46890DA8.4070400@garzik.org> Date: Mon, 02 Jul 2007 10:37:28 -0400 From: Jeff Garzik User-Agent: Thunderbird 1.5.0.12 (X11/20070530) MIME-Version: 1.0 To: Alex Riesen CC: Jesper Juhl , "Robert P. J. Day" , Linux Kernel Mailing List , Git Mailing List , Linus Torvalds , Sam Ravnborg Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h? References: <4688EF9B.8020405@garzik.org> <9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com> <4689073D.1020802@garzik.org> <81b0412b0707020722q25e8eb41t456e7316fe4a7b40@mail.gmail.com> In-Reply-To: <81b0412b0707020722q25e8eb41t456e7316fe4a7b40@mail.gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -4.3 (----) X-Spam-Report: SpamAssassin version 3.1.9 on srv5.dvmed.net summary: Content analysis details: (-4.3 points, 5.0 required) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Alex Riesen wrote: > Do some of your branches miss the commit by which it was removed? git-clone followed by git-checkout master recreates the problem. But to answer your question directly, I rebase, so they absolutely do not miss any commits. > It is somewhat unclear what "reappear" means, though: do you mean Attempts to give you precise output to answer your question yielded a data point, the kernel's "make distclean" causes this: [jgarzik@pretzel linux-2.6]$ make distclean && git checkout master && git diff HEAD D include/asm-blackfin/macros.h Switched to branch "master" diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h deleted file mode 100644 index e69de29..0000000 [jgarzik@pretzel linux-2.6]$ git checkout -f [jgarzik@pretzel linux-2.6]$ make distclean && git checkout master && git diff HEAD D include/asm-blackfin/macros.h Switched to branch "master" diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h deleted file mode 100644 index e69de29..0000000 [jgarzik@pretzel linux-2.6]$ git checkout -f [jgarzik@pretzel linux-2.6]$ git checkout master && git diff HEADSwitched to branch "master" [jgarzik@pretzel linux-2.6]$ git checkout master && git diff HEAD Switched to branch "master" [jgarzik@pretzel linux-2.6]$ So, not a git problem but a kernel Makefile problem. Sorry for the git noise. Jeff