[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20070714074558.GA8047@uranus.ravnborg.org>
Date: Sat, 14 Jul 2007 09:45:58 +0200
From: Sam Ravnborg <sam@...nborg.org>
To: Jeff Garzik <jeff@...zik.org>
Cc: Alex Riesen <raa.lkml@...il.com>,
Jesper Juhl <jesper.juhl@...il.com>,
"Robert P. J. Day" <rpjday@...dspring.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Git Mailing List <git@...r.kernel.org>,
Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h?
On Mon, Jul 02, 2007 at 10:37:28AM -0400, Jeff Garzik wrote:
> 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@...tzel 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@...tzel linux-2.6]$ git checkout -f
>
> [jgarzik@...tzel 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@...tzel linux-2.6]$ git checkout -f
>
> [jgarzik@...tzel linux-2.6]$ git checkout master && git diff
> HEADSwitched to branch "master"
>
> [jgarzik@...tzel linux-2.6]$ git checkout master && git diff HEAD
> Switched to branch "master"
>
> [jgarzik@...tzel linux-2.6]$
>
>
> So, not a git problem but a kernel Makefile problem. Sorry for the git
> noise.
distclean on purpose delete zero size files.
And the kernel tree shall not contain such files - if it does it is a bug.
So I do not see a 'problem' with the kernel makefile but instead a problem
with the kernel tree wich is about to be fixed.
Agree?
Sam
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists