on an occasional basis (after pulls), i get:
$ git diff
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
deleted file mode 100644
index e69de29..0000000
$
not the first time i've seen that, either. methinks that file got
itself into a funny state.
rday
--
========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA
Linux Consulting, Training and Annoying Kernel Pedantry.
Web page: http://crashcourse.ca
Linked In: http://www.linkedin.com/in/rpjday
Twitter: http://twitter.com/rpjday
========================================================================
Hi Robert,
On Fri, Jul 10, 2009 at 05:06:49AM -0400, Robert P. J. Day wrote:
>
> on an occasional basis (after pulls), i get:
>
> $ git diff
> diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
> deleted file mode 100644
> index e69de29..0000000
> $
>
> not the first time i've seen that, either. methinks that file got
> itself into a funny state.
No need to panic, it just looks like somebody left an empty file without
'git rm'ing it. When you run 'make distclean' for example, it removes
all empty files and leaves you with an unclean checkout. You can get the
(empty) file back by 'git checkout'ing the file. But yes, you shouldn't
have to. Anyway, CCing Linus to bring it to his attention.
I wonder if there is a better way to avoid this happening? If 'make
distclean' is assuming that no files should be empty then there should
probably be a guard against introducing empty files in the first place.
Can git warn us when we commit or merge changes which leave empty files,
for instance?
Andrew
On Sat, 11 Jul 2009, Andrew Price wrote:
> Hi Robert,
>
> On Fri, Jul 10, 2009 at 05:06:49AM -0400, Robert P. J. Day wrote:
> >
> > on an occasional basis (after pulls), i get:
> >
> > $ git diff
> > diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
> > deleted file mode 100644
> > index e69de29..0000000
> > $
> >
> > not the first time i've seen that, either. methinks that file got
> > itself into a funny state.
>
> No need to panic, ...
i never panic -- i always know where my towel is.
> it just looks like somebody left an empty file without 'git rm'ing
> it. When you run 'make distclean' for example, it removes all empty
> files and leaves you with an unclean checkout. You can get the
> (empty) file back by 'git checkout'ing the file. But yes, you
> shouldn't have to. Anyway, CCing Linus to bring it to his attention.
i knew it was something like that as i recall whining about
*exactly* this happening many months ago with a different file, i just
couldn't remember the cause.
rday
--
========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA
Linux Consulting, Training and Annoying Kernel Pedantry.
Web page: http://crashcourse.ca
Twitter: http://twitter.com/rpjday
"Kernel Newbie Corner" column @ linux.com: http://cli.gs/WG6WYX
========================================================================