* Zero-length ARM headers in git HEAD
@ 2011-10-28 19:50 Jeff Garzik
2011-10-28 20:09 ` Linus Walleij
2011-10-28 20:37 ` Russell King
0 siblings, 2 replies; 3+ messages in thread
From: Jeff Garzik @ 2011-10-28 19:50 UTC (permalink / raw)
To: LKML
Cc: linus.walleij, Russell King, swarren, Olof Johansson,
Ben Hutchings, Arnaud Patard (Rtp), Grant Likely, Wolfram Sang,
bs14
Gents,
In the following kernel commits,
9c587c05d715ca8461342c2cb3b4a67036b5c22b
ea5abbd215b749b2ff14397a47a5e65741c67bf4
cc890cd78acd7ab03442907d354b6af34e973cb3
the file ...$platform/mach/gpio.h is replaced with an empty file. This
disagrees with kernel tradition and kernel makefiles, where zero length
files are intentionally deleted when "make distclean" is executed.
As a result, git sequences such as "make distclean ; git checkout
master" may fail, because several files are present in the index but not
on disk, making it appear as if modifications have been made:
$ git checkout master
D arch/arm/mach-lpc32xx/include/mach/gpio.h
D arch/arm/mach-tegra/include/mach/gpio.h
D arch/arm/mach-u300/include/mach/gpio.h
An update, either (a) making these files non-zero length or (b) deleting
the files in git would be appreciated. Reading the commit descriptions,
it appears (a) is the correct path?
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Zero-length ARM headers in git HEAD
2011-10-28 19:50 Zero-length ARM headers in git HEAD Jeff Garzik
@ 2011-10-28 20:09 ` Linus Walleij
2011-10-28 20:37 ` Russell King
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2011-10-28 20:09 UTC (permalink / raw)
To: Jeff Garzik
Cc: LKML, Russell King, swarren, Olof Johansson, Ben Hutchings,
Arnaud Patard (Rtp), Grant Likely, Wolfram Sang, bs14
On Fri, Oct 28, 2011 at 9:50 PM, Jeff Garzik <jeff@garzik.org> wrote:
> the file ...$platform/mach/gpio.h is replaced with an empty file. This
> disagrees with kernel tradition and kernel makefiles, where zero length
> files are intentionally deleted when "make distclean" is executed.
>
> As a result, git sequences such as "make distclean ; git checkout master"
> may fail, because several files are present in the index but not on disk,
> making it appear as if modifications have been made:
Argh!
> An update, either (a) making these files non-zero length or (b) deleting the
> files in git would be appreciated. Reading the commit descriptions, it
> appears (a) is the correct path?
Russell already told me what to do, I just was too stupid to go back
and fix it up properly so I'm doing that now.
Thanks,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Zero-length ARM headers in git HEAD
2011-10-28 19:50 Zero-length ARM headers in git HEAD Jeff Garzik
2011-10-28 20:09 ` Linus Walleij
@ 2011-10-28 20:37 ` Russell King
1 sibling, 0 replies; 3+ messages in thread
From: Russell King @ 2011-10-28 20:37 UTC (permalink / raw)
To: Jeff Garzik
Cc: LKML, linus.walleij, swarren, Olof Johansson, Ben Hutchings,
Arnaud Patard (Rtp), Grant Likely, Wolfram Sang, bs14
On Fri, Oct 28, 2011 at 03:50:10PM -0400, Jeff Garzik wrote:
> Gents,
>
> In the following kernel commits,
>
> 9c587c05d715ca8461342c2cb3b4a67036b5c22b
> ea5abbd215b749b2ff14397a47a5e65741c67bf4
> cc890cd78acd7ab03442907d354b6af34e973cb3
>
> the file ...$platform/mach/gpio.h is replaced with an empty file. This
> disagrees with kernel tradition and kernel makefiles, where zero length
> files are intentionally deleted when "make distclean" is executed.
It would really help to have a hook in git which catches this at commit
time with a warning (like is possible for whitespace). At least that
would alert folk to the problem at commit time before stuff has been
published.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-28 20:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-28 19:50 Zero-length ARM headers in git HEAD Jeff Garzik
2011-10-28 20:09 ` Linus Walleij
2011-10-28 20:37 ` Russell King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox