From: Jeff Garzik <jeff@garzik.org>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: Jesper Juhl <jesper.juhl@gmail.com>,
"Robert P. J. Day" <rpjday@mindspring.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Git Mailing List <git@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Sam Ravnborg <sam@ravnborg.org>
Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h?
Date: Mon, 02 Jul 2007 10:37:28 -0400 [thread overview]
Message-ID: <46890DA8.4070400@garzik.org> (raw)
In-Reply-To: <81b0412b0707020722q25e8eb41t456e7316fe4a7b40@mail.gmail.com>
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
next prev parent reply other threads:[~2007-07-02 14:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-02 12:00 why does git perpetually complain about include/asm-blackfin/macros.h? Robert P. J. Day
2007-07-02 12:29 ` Jeff Garzik
2007-07-02 13:58 ` Jesper Juhl
2007-07-02 14:10 ` Jeff Garzik
2007-07-02 14:22 ` Robert P. J. Day
2007-07-02 14:22 ` Alex Riesen
2007-07-02 14:25 ` Alex Riesen
2007-07-02 14:29 ` Marco Roeland
2007-07-02 15:09 ` [PATCH] Blackfin arch: include/asm-blackfin/macros.h die die die Marco Roeland
2007-07-03 0:39 ` Bryan Wu
2007-07-02 14:37 ` Jeff Garzik [this message]
2007-07-14 7:45 ` why does git perpetually complain about include/asm-blackfin/macros.h? Sam Ravnborg
2007-07-02 14:24 ` Marco Roeland
2007-07-03 0:28 ` Bryan Wu
2007-07-02 15:36 ` Linus Torvalds
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=46890DA8.4070400@garzik.org \
--to=jeff@garzik.org \
--cc=git@vger.kernel.org \
--cc=jesper.juhl@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=raa.lkml@gmail.com \
--cc=rpjday@mindspring.com \
--cc=sam@ravnborg.org \
--cc=torvalds@linux-foundation.org \
/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.