{"thread":{"id":"8808","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","startedAt":"2007-07-02T12:29:15Z","lastAt":"2007-07-14T07:45:58Z","messageCount":14,"participants":["Jeff Garzik","Jesper Juhl","Alex Riesen","Robert P. J. Day","Marco Roeland","Linus Torvalds","Bryan Wu","Sam Ravnborg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"46232","messageId":"4688EF9B.8020405@garzik.org","threadId":"8808","inReplyTo":"Pine.LNX.4.64.0707020800010.1972@localhost.localdomain","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Jeff Garzik","fromEmail":"jeff@garzik.org","sentAt":"2007-07-02T12:29:15Z","receivedAt":"2007-07-02T12:29:15Z","isPatch":false,"sender":{"key":"jeff@garzik.org","avatar":null},"body":"Robert P. J. Day wrote:\n> for the umpteenth time, after doing a pull, i see this:\n> \n> $ git diff\n> diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\n> deleted file mode 100644\n> index e69de29..0000000\n> $\n\nI have the same problem. git 1.5.0.6 on Fedora Core 5 or 6.\n\nI even tried a completely fresh clone, but the problem still appears.\n\n\tJeff\n"},{"id":"46235","messageId":"9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com","threadId":"8808","inReplyTo":"4688EF9B.8020405@garzik.org","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Jesper Juhl","fromEmail":"jesper.juhl@gmail.com","sentAt":"2007-07-02T13:58:39Z","receivedAt":"2007-07-02T13:58:39Z","isPatch":false,"sender":{"key":"jesper.juhl@gmail.com","avatar":null},"body":"On 02/07/07, Jeff Garzik wrote:\n> Robert P. J. Day wrote:\n> > for the umpteenth time, after doing a pull, i see this:\n> >\n> > $ git diff\n> > diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\n> > deleted file mode 100644\n> > index e69de29..0000000\n> > $\n>\n> I have the same problem. git 1.5.0.6 on Fedora Core 5 or 6.\n>\n> I even tried a completely fresh clone, but the problem still appears.\n>\nI've seen that as well, but in my case doing a\n$ git reset --hard master\nfixed it.\n\n-- \nJesper Juhl \nDon't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html\nPlain text mails only, please http://www.expita.com/nomime.html\n"},{"id":"46236","messageId":"4689073D.1020802@garzik.org","threadId":"8808","inReplyTo":"9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Jeff Garzik","fromEmail":"jeff@garzik.org","sentAt":"2007-07-02T14:10:05Z","receivedAt":"2007-07-02T14:10:05Z","isPatch":false,"sender":{"key":"jeff@garzik.org","avatar":null},"body":"Jesper Juhl wrote:\n> On 02/07/07, Jeff Garzik wrote:\n>> Robert P. J. Day wrote:\n>> > for the umpteenth time, after doing a pull, i see this:\n>> >\n>> > $ git diff\n>> > diff --git a/include/asm-blackfin/macros.h \n>> b/include/asm-blackfin/macros.h\n>> > deleted file mode 100644\n>> > index e69de29..0000000\n>> > $\n>>\n>> I have the same problem. git 1.5.0.6 on Fedora Core 5 or 6.\n>>\n>> I even tried a completely fresh clone, but the problem still appears.\n>>\n> I've seen that as well, but in my case doing a\n> $ git reset --hard master\n> fixed it.\n\nSure. git checkout -f fixes it too.\n\nBut then it reappears the every time I switch branches.\n\n\tJeff\n"},{"id":"46239","messageId":"Pine.LNX.4.64.0707021021090.20805@localhost.localdomain","threadId":"8808","inReplyTo":"4689073D.1020802@garzik.org","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Robert P. J. Day","fromEmail":"rpjday@mindspring.com","sentAt":"2007-07-02T14:22:05Z","receivedAt":"2007-07-02T14:22:05Z","isPatch":false,"sender":{"key":"rpjday@mindspring.com","avatar":null},"body":"On Mon, 2 Jul 2007, Jeff Garzik wrote:\n\n> Jesper Juhl wrote:\n> > On 02/07/07, Jeff Garzik wrote:\n> > > Robert P. J. Day wrote:\n> > > > for the umpteenth time, after doing a pull, i see this:\n> > > >\n> > > > $ git diff\n> > > > diff --git a/include/asm-blackfin/macros.h\n> > > b/include/asm-blackfin/macros.h\n> > > > deleted file mode 100644\n> > > > index e69de29..0000000\n> > > > $\n> > >\n> > > I have the same problem. git 1.5.0.6 on Fedora Core 5 or 6.\n> > >\n> > > I even tried a completely fresh clone, but the problem still appears.\n> > >\n> > I've seen that as well, but in my case doing a\n> > $ git reset --hard master\n> > fixed it.\n>\n> Sure. git checkout -f fixes it too.\n>\n> But then it reappears the every time I switch branches.\n\nsame here -- checkout fixes it, but back it comes after the next pull.\nnot fatal -- just annoying.\n\nrday\n-- \n========================================================================\nRobert P. J. Day\nLinux Consulting, Training and Annoying Kernel Pedantry\nWaterloo, Ontario, CANADA\n\nhttp://fsdev.net/wiki/index.php?title=Main_Page\n========================================================================\n"},{"id":"46237","messageId":"81b0412b0707020722q25e8eb41t456e7316fe4a7b40@mail.gmail.com","threadId":"8808","inReplyTo":"4689073D.1020802@garzik.org","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-07-02T14:22:07Z","receivedAt":"2007-07-02T14:22:07Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 7/2/07, Jeff Garzik wrote:\n> Jesper Juhl wrote:\n> > On 02/07/07, Jeff Garzik wrote:\n> >> Robert P. J. Day wrote:\n> >> > for the umpteenth time, after doing a pull, i see this:\n> >> >\n> >> > $ git diff\n> >> > diff --git a/include/asm-blackfin/macros.h\n> >> b/include/asm-blackfin/macros.h\n> >> > deleted file mode 100644\n> >> > index e69de29..0000000\n> >> > $\n> >>\n> >> I have the same problem. git 1.5.0.6 on Fedora Core 5 or 6.\n> >>\n> >> I even tried a completely fresh clone, but the problem still appears.\n> >>\n> > I've seen that as well, but in my case doing a\n> > $ git reset --hard master\n> > fixed it.\n>\n> Sure. git checkout -f fixes it too.\n>\n> But then it reappears the every time I switch branches.\n>\n\nDo some of your branches miss the commit by which it was removed?\n(It was removed in df30b1171714bbf0e55ffe02138be4b8447e4235)\nThan it will reappear every time you switch to a branch which still has\nthe file.\n\nIt is somewhat unclear what \"reappear\" means, though: do you mean\nin your working directory (that's what I explained above) or do you\nmean: on the commit pointed by HEAD?\n\nIn that second case I can only suspect that all your branches point\nat the same commit, which is just before the one the file was removed\nin...\n"},{"id":"46240","messageId":"20070702142430.GA10400@fiberbit.xs4all.nl","threadId":"8808","inReplyTo":"9a8748490707020658t5e6542ag6edb435dbc4499ab@mail.gmail.com","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Marco Roeland","fromEmail":"marco.roeland@xs4all.nl","sentAt":"2007-07-02T14:24:30Z","receivedAt":"2007-07-02T14:24:30Z","isPatch":false,"sender":{"key":"marco.roeland@xs4all.nl","avatar":null},"body":"On Monday July 2nd 2007 at 15:58 Jesper Juhl wrote:\n\n> [obnoxious zero sized file include/asm-blackfin/macros.h that gets\n> zapped by toolchains and resurrected again by git]\n>\n> I've seen that as well, but in my case doing a\n> $ git reset --hard master\n> fixed it.\n\nDangerous, as it may overwrite local changes you have! A simple \"git\ncheckout include/asm-blackfin/macros.h\" is much safer in this case.\n\nIn git commit df30b11 this file got redundant. Perhaps because a normal\npatch was applied, instead of with git, the file didn't get deleted from\nthe repository but truncated to size zero. Not strictly wrong perse, but\nfor the Linux repository highly unusual (and the only one at that).\n\nYour toolchain perhaps deletes files with zero size after cleaning up or\nsomething. Git then notices that you deleted this file.\n\nPerhaps someone can apply something like the following to finally fix\nthis up:\n\ncommit 7d98740800f3d9ad2428afa8c677be9573a51b7b\nAuthor: Marco Roeland \nDate: Mon Jul 2 16:19:49 2007 +0200\n\n Blackfin arch: remove zero-sized include/asm-blackfin/macros.h\n \n This file accidentally got truncated instead of deleted in commit df30b11.\n \n Signed-off-by: Marco Roeland \n\ndiff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\ndeleted file mode 100644\nindex e69de29..0000000\n"},{"id":"46241","messageId":"81b0412b0707020725t2e95b972y2d52ec902a31a616@mail.gmail.com","threadId":"8808","inReplyTo":"81b0412b0707020722q25e8eb41t456e7316fe4a7b40@mail.gmail.com","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-07-02T14:25:37Z","receivedAt":"2007-07-02T14:25:37Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 7/2/07, Alex Riesen wrote:\n> In that second case I can only suspect that all your branches point\n> at the same commit, which is just before the one the file was removed\n> in...\n\n_Not_ the same. Just some commit before the file was removed, of course.\n"},{"id":"46242","messageId":"20070702142926.GB10400@fiberbit.xs4all.nl","threadId":"8808","inReplyTo":"81b0412b0707020722q25e8eb41t456e7316fe4a7b40@mail.gmail.com","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Marco Roeland","fromEmail":"marco.roeland@xs4all.nl","sentAt":"2007-07-02T14:29:26Z","receivedAt":"2007-07-02T14:29:26Z","isPatch":false,"sender":{"key":"marco.roeland@xs4all.nl","avatar":null},"body":"On Monday July 2nd 2007 at 16:22 Alex Riesen wrote:\n\n> Do some of your branches miss the commit by which it was removed?\n> (It was removed in df30b1171714bbf0e55ffe02138be4b8447e4235)\n> Than it will reappear every time you switch to a branch which still has\n> the file.\n\nThe problem is that this commit didn't delete the file, but truncated it\nto zero size. How it got to be like that is another matter. Within the\nkernel zero sized files are not supposed to be there, by widely accepted\npractice. So lots of tools assume they should delete them!\n-- \nMarco Roeland\n"},{"id":"46243","messageId":"46890DA8.4070400@garzik.org","threadId":"8808","inReplyTo":"81b0412b0707020722q25e8eb41t456e7316fe4a7b40@mail.gmail.com","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Jeff Garzik","fromEmail":"jeff@garzik.org","sentAt":"2007-07-02T14:37:28Z","receivedAt":"2007-07-02T14:37:28Z","isPatch":false,"sender":{"key":"jeff@garzik.org","avatar":null},"body":"Alex Riesen wrote:\n> Do some of your branches miss the commit by which it was removed?\n\ngit-clone followed by git-checkout master recreates the problem.\n\nBut to answer your question directly, I rebase, so they absolutely do \nnot miss any commits.\n\n\n> It is somewhat unclear what \"reappear\" means, though: do you mean\n\nAttempts to give you precise output to answer your question yielded a \ndata point, the kernel's \"make distclean\" causes this:\n\n[jgarzik@pretzel linux-2.6]$ make distclean && git checkout master && \ngit diff HEAD\nD include/asm-blackfin/macros.h\nSwitched to branch \"master\"\ndiff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\ndeleted file mode 100644\nindex e69de29..0000000\n\n[jgarzik@pretzel linux-2.6]$ git checkout -f\n\n[jgarzik@pretzel linux-2.6]$ make distclean && git checkout master && \ngit diff HEAD\nD include/asm-blackfin/macros.h\nSwitched to branch \"master\"\ndiff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\ndeleted file mode 100644\nindex e69de29..0000000\n\n[jgarzik@pretzel linux-2.6]$ git checkout -f\n\n[jgarzik@pretzel linux-2.6]$ git checkout master && git diff \nHEADSwitched to branch \"master\"\n\n[jgarzik@pretzel linux-2.6]$ git checkout master && git diff HEAD\nSwitched to branch \"master\"\n\n[jgarzik@pretzel linux-2.6]$\n\n\nSo, not a git problem but a kernel Makefile problem. Sorry for the git \nnoise.\n\n\tJeff\n"},{"id":"46246","messageId":"20070702150915.GC10400@fiberbit.xs4all.nl","threadId":"8808","inReplyTo":"20070702142926.GB10400@fiberbit.xs4all.nl","subject":"[PATCH] Blackfin arch: include/asm-blackfin/macros.h die die die","fromName":"Marco Roeland","fromEmail":"marco.roeland@xs4all.nl","sentAt":"2007-07-02T15:09:15Z","receivedAt":"2007-07-02T15:09:15Z","isPatch":true,"sender":{"key":"marco.roeland@xs4all.nl","avatar":null},"body":"This file accidentally got truncated instead of deleted in commit df30b11.\nDoing a \"make distclean\" or \"make mrproper\" deletes this file because of\nits zero size. Git then sees this as an uncommitted local change.\n\nSigned-off-by: Marco Roeland \n---\n 0 files changed, 0 insertions(+), 0 deletions(-)\n delete mode 100644 include/asm-blackfin/macros.h\n\ndiff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\ndeleted file mode 100644\nindex e69de29..0000000\n-- \n1.5.2.2.1451.gb0e5e\n"},{"id":"46247","messageId":"alpine.LFD.0.98.0707020834310.9434@woody.linux-foundation.org","threadId":"8808","inReplyTo":"4688EF9B.8020405@garzik.org","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Linus Torvalds","fromEmail":"torvalds@linux-foundation.org","sentAt":"2007-07-02T15:36:35Z","receivedAt":"2007-07-02T15:36:35Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Mon, 2 Jul 2007, Jeff Garzik wrote:\n\n> Robert P. J. Day wrote:\n> > for the umpteenth time, after doing a pull, i see this:\n> > \n> > $ git diff\n> > diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\n> > deleted file mode 100644\n> > index e69de29..0000000\n> > $\n> \n> I have the same problem. git 1.5.0.6 on Fedora Core 5 or 6.\n> \n> I even tried a completely fresh clone, but the problem still appears.\n\nGit complains for a very simple reason: that file is an empty file, and \n\"make clean\" removes all zero-sized files.\n\nSo whenever anybody does a \"make clean\" (maybe it's \"make distclean\", I \nforget), you will have removed the empty file, and git will show it as a \ndiff.\n\nWe probably should just remove the file from the kernel archive.\n\n\t\tLinus\n"},{"id":"46305","messageId":"1183422489.10353.2.camel@roc-laptop","threadId":"8808","inReplyTo":"20070702142430.GA10400@fiberbit.xs4all.nl","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Bryan Wu","fromEmail":"bryan.wu@analog.com","sentAt":"2007-07-03T00:28:09Z","receivedAt":"2007-07-03T00:28:09Z","isPatch":false,"sender":{"key":"bryan.wu@analog.com","avatar":null},"body":"On Mon, 2007-07-02 at 16:24 +0200, Marco Roeland wrote:\n> On Monday July 2nd 2007 at 15:58 Jesper Juhl wrote:\n> \n> > [obnoxious zero sized file include/asm-blackfin/macros.h that gets\n> > zapped by toolchains and resurrected again by git]\n> >\n> > I've seen that as well, but in my case doing a\n> > $ git reset --hard master\n> > fixed it.\n> \n> Dangerous, as it may overwrite local changes you have! A simple \"git\n> checkout include/asm-blackfin/macros.h\" is much safer in this case.\n> \n> In git commit df30b11 this file got redundant. Perhaps because a normal\n> patch was applied, instead of with git, the file didn't get deleted from\n> the repository but truncated to size zero. Not strictly wrong perse, but\n> for the Linux repository highly unusual (and the only one at that).\n> \n> Your toolchain perhaps deletes files with zero size after cleaning up or\n> something. Git then notices that you deleted this file.\n> \n> Perhaps someone can apply something like the following to finally fix\n> this up:\n> \n> commit 7d98740800f3d9ad2428afa8c677be9573a51b7b\n> Author: Marco Roeland \n> Date: Mon Jul 2 16:19:49 2007 +0200\n> \n> Blackfin arch: remove zero-sized include/asm-blackfin/macros.h\n> \n> This file accidentally got truncated instead of deleted in commit df30b11.\n> \n> Signed-off-by: Marco Roeland \n> \n> diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\n> deleted file mode 100644\n> index e69de29..0000000\n> -\n\nThanks, Applied to the blackfin-2.6.git tree for Linus pull.\n\n- Bryan\n\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n"},{"id":"46308","messageId":"1183423159.10353.10.camel@roc-laptop","threadId":"8808","inReplyTo":"20070702150915.GC10400@fiberbit.xs4all.nl","subject":"Re: [PATCH] Blackfin arch: include/asm-blackfin/macros.h die die die","fromName":"Bryan Wu","fromEmail":"bryan.wu@analog.com","sentAt":"2007-07-03T00:39:19Z","receivedAt":"2007-07-03T00:39:19Z","isPatch":true,"sender":{"key":"bryan.wu@analog.com","avatar":null},"body":"On Mon, 2007-07-02 at 17:09 +0200, Marco Roeland wrote:\n> This file accidentally got truncated instead of deleted in commit df30b11.\n> Doing a \"make distclean\" or \"make mrproper\" deletes this file because of\n> its zero size. Git then sees this as an uncommitted local change.\n> \n> Signed-off-by: Marco Roeland \n> ---\n> 0 files changed, 0 insertions(+), 0 deletions(-)\n> delete mode 100644 include/asm-blackfin/macros.h\n> \n> diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\n> deleted file mode 100644\n> index e69de29..0000000\n\nThanks already in blackfin-2.6.git tree for Linus pull\nAcked by: Bryan Wu \n"},{"id":"47325","messageId":"20070714074558.GA8047@uranus.ravnborg.org","threadId":"8808","inReplyTo":"46890DA8.4070400@garzik.org","subject":"Re: why does git perpetually complain about include/asm-blackfin/macros.h?","fromName":"Sam Ravnborg","fromEmail":"sam@ravnborg.org","sentAt":"2007-07-14T07:45:58Z","receivedAt":"2007-07-14T07:45:58Z","isPatch":false,"sender":{"key":"sam@ravnborg.org","avatar":"https://gravatar.com/avatar/168a912606ed0742d840bb365e3cc21db390c36531a58341dc7a069cc1f15f62?d=mp&s=160"},"body":"On Mon, Jul 02, 2007 at 10:37:28AM -0400, Jeff Garzik wrote:\n> Alex Riesen wrote:\n> >Do some of your branches miss the commit by which it was removed?\n> \n> git-clone followed by git-checkout master recreates the problem.\n> \n> But to answer your question directly, I rebase, so they absolutely do \n> not miss any commits.\n> \n> \n> >It is somewhat unclear what \"reappear\" means, though: do you mean\n> \n> Attempts to give you precise output to answer your question yielded a \n> data point, the kernel's \"make distclean\" causes this:\n> \n> [jgarzik@pretzel linux-2.6]$ make distclean && git checkout master && \n> git diff HEAD\n> D include/asm-blackfin/macros.h\n> Switched to branch \"master\"\n> diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\n> deleted file mode 100644\n> index e69de29..0000000\n> \n> [jgarzik@pretzel linux-2.6]$ git checkout -f\n> \n> [jgarzik@pretzel linux-2.6]$ make distclean && git checkout master && \n> git diff HEAD\n> D include/asm-blackfin/macros.h\n> Switched to branch \"master\"\n> diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h\n> deleted file mode 100644\n> index e69de29..0000000\n> \n> [jgarzik@pretzel linux-2.6]$ git checkout -f\n> \n> [jgarzik@pretzel linux-2.6]$ git checkout master && git diff \n> HEADSwitched to branch \"master\"\n> \n> [jgarzik@pretzel linux-2.6]$ git checkout master && git diff HEAD\n> Switched to branch \"master\"\n> \n> [jgarzik@pretzel linux-2.6]$\n> \n> \n> So, not a git problem but a kernel Makefile problem. Sorry for the git \n> noise.\n\ndistclean on purpose delete zero size files.\nAnd the kernel tree shall not contain such files - if it does it is a bug.\n\nSo I do not see a 'problem' with the kernel makefile but instead a problem\nwith the kernel tree wich is about to be fixed.\n\nAgree?\n\n\tSam\n"}]}