{"thread":{"id":"3953","subject":"weird pull behavior as of late","startedAt":"2006-04-24T00:59:53Z","lastAt":"2006-04-24T19:46:00Z","messageCount":5,"participants":["David S. Miller","Junio C Hamano","Kyle McMartin","Sergey Vlasov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"19027","messageId":"20060423.175953.52710961.davem@davemloft.net","threadId":"3953","inReplyTo":null,"subject":"weird pull behavior as of late","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2006-04-24T00:59:53Z","receivedAt":"2006-04-24T00:59:53Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"\nI just pulled from Linus's linux-2.6.git tree knowing there was a bit\nof activity over the past day:\n\nGenerating pack...\nDone counting 446 objects.\nDeltifying 446 objects.\n 100% (446/446) done\nUnpacking 446 objects\nTotal 446, written 446 (delta 235), reused 0 (delta 0)\n 100% (446/446) done\n* refs/heads/origin: fast forward to branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6\n from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef\n\nUpdating from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef\nFast forward\n MAINTAINERS | 4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\nI got 446 objects and this amounted to just a 4 line change to the\nMAINTAINERS file? :-)\n\nIf I do a \"gitk ORIG_HEAD..\" all the changes are there, just the\ndiffstat it spits out during the pull is weird.\n\nJust FYI...\n"},{"id":"19028","messageId":"7vy7xvdb3x.fsf@assigned-by-dhcp.cox.net","threadId":"3953","inReplyTo":"20060423.175953.52710961.davem@davemloft.net","subject":"Re: weird pull behavior as of late","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-24T01:18:58Z","receivedAt":"2006-04-24T01:18:58Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"David S. Miller\" writes:\n\n> Updating from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef\n> Fast forward\n> MAINTAINERS | 4 ++++\n> 1 files changed, 4 insertions(+), 0 deletions(-)\n>\n> I got 446 objects and this amounted to just a 4 line change to the\n> MAINTAINERS file? :-)\n\nThat is weird, certainly, and does not match what I am getting...\n\nUpdating from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef\nFast forward\n MAINTAINERS | 4\n arch/parisc/Kconfig | 31 +\n arch/parisc/defconfig | 494 +++++++++++------\n ... (many lines later)\n sound/ppc/tumbler.c | 2\n 91 files changed, 3008 insertions(+), 1286 deletions(-)\n create mode 100644 drivers/char/tpm/tpm_tis.c\n"},{"id":"19030","messageId":"20060424012836.GC19550@quicksilver.road.mcmartin.ca","threadId":"3953","inReplyTo":"7vy7xvdb3x.fsf@assigned-by-dhcp.cox.net","subject":"Re: weird pull behavior as of late","fromName":"Kyle McMartin","fromEmail":"kyle@parisc-linux.org","sentAt":"2006-04-24T01:28:36Z","receivedAt":"2006-04-24T01:28:36Z","isPatch":false,"sender":{"key":"kyle@parisc-linux.org","avatar":null},"body":"On Sun, Apr 23, 2006 at 06:18:58PM -0700, Junio C Hamano wrote:\n> \"David S. Miller\" writes:\n> \n> > Updating from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef\n> > Fast forward\n> > MAINTAINERS | 4 ++++\n> > 1 files changed, 4 insertions(+), 0 deletions(-)\n> >\n> > I got 446 objects and this amounted to just a 4 line change to the\n> > MAINTAINERS file? :-)\n> \n> That is weird, certainly, and does not match what I am getting...\n>\n\nHmm, I saw this when I did a git diff linus..master on my tree on hera\nbefore I sent the pull request, but when I did git request-pull it \nhad All The Right Stuff (tm), so I assumed I just mucked something up\nwith my command-line options. When I looked at the tree in gitk,\neverything looked sane as well.\n\nHope I didn't break anything...\n\nCheers,\n\tKyle \n"},{"id":"19042","messageId":"20060424132922.6e634188.vsu@altlinux.ru","threadId":"3953","inReplyTo":"20060423.175953.52710961.davem@davemloft.net","subject":"Re: weird pull behavior as of late","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2006-04-24T09:29:22Z","receivedAt":"2006-04-24T09:29:22Z","isPatch":false,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"On Sun, 23 Apr 2006 17:59:53 -0700 (PDT) David S. Miller wrote:\n\n> Fast forward\n> MAINTAINERS | 4 ++++\n> 1 files changed, 4 insertions(+), 0 deletions(-)\n> \n> I got 446 objects and this amounted to just a 4 line change to the\n> MAINTAINERS file? :-)\n\nI got the same problem recently and tracked it down to a stale diff.o\nobject file inside libgit.a - apparently \"ar rcs\" does not recreate the\narchive from scratch. After \"make clean\" the problem has vanished.\n"},{"id":"19056","messageId":"20060424.124600.93277140.davem@davemloft.net","threadId":"3953","inReplyTo":"20060424132922.6e634188.vsu@altlinux.ru","subject":"Re: weird pull behavior as of late","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2006-04-24T19:46:00Z","receivedAt":"2006-04-24T19:46:00Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"From: Sergey Vlasov \nDate: Mon, 24 Apr 2006 13:29:22 +0400\n\n> On Sun, 23 Apr 2006 17:59:53 -0700 (PDT) David S. Miller wrote:\n> \n> > Fast forward\n> > MAINTAINERS | 4 ++++\n> > 1 files changed, 4 insertions(+), 0 deletions(-)\n> > \n> > I got 446 objects and this amounted to just a 4 line change to the\n> > MAINTAINERS file? :-)\n> \n> I got the same problem recently and tracked it down to a stale diff.o\n> object file inside libgit.a - apparently \"ar rcs\" does not recreate the\n> archive from scratch. After \"make clean\" the problem has vanished.\n\nThanks, I'll give that a try.\n"}]}