# weird pull behavior as of late 5 messages from 2006-04-24 to 2006-04-24. Participants: David S. Miller, Junio C Hamano, Kyle McMartin, Sergey Vlasov. Thread: https://gitlist.dev/t/3953 ## David S. Miller, 2006-04-24 00:59 Subject: weird pull behavior as of late Message-ID: <20060423.175953.52710961.davem@davemloft.net> URL: https://gitlist.dev/e/20060423.175953.52710961.davem%40davemloft.net ``` I just pulled from Linus's linux-2.6.git tree knowing there was a bit of activity over the past day: Generating pack... Done counting 446 objects. Deltifying 446 objects. 100% (446/446) done Unpacking 446 objects Total 446, written 446 (delta 235), reused 0 (delta 0) 100% (446/446) done * refs/heads/origin: fast forward to branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef Updating from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef Fast forward MAINTAINERS | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) I got 446 objects and this amounted to just a 4 line change to the MAINTAINERS file? :-) If I do a "gitk ORIG_HEAD.." all the changes are there, just the diffstat it spits out during the pull is weird. Just FYI... ``` ## Junio C Hamano, 2006-04-24 01:18 Subject: Re: weird pull behavior as of late Message-ID: <7vy7xvdb3x.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vy7xvdb3x.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20060423.175953.52710961.davem@davemloft.net> ``` "David S. Miller" writes: > Updating from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef > Fast forward > MAINTAINERS | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > I got 446 objects and this amounted to just a 4 line change to the > MAINTAINERS file? :-) That is weird, certainly, and does not match what I am getting... Updating from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef Fast forward MAINTAINERS | 4 arch/parisc/Kconfig | 31 + arch/parisc/defconfig | 494 +++++++++++------ ... (many lines later) sound/ppc/tumbler.c | 2 91 files changed, 3008 insertions(+), 1286 deletions(-) create mode 100644 drivers/char/tpm/tpm_tis.c ``` ## Kyle McMartin, 2006-04-24 01:28 Subject: Re: weird pull behavior as of late Message-ID: <20060424012836.GC19550@quicksilver.road.mcmartin.ca> URL: https://gitlist.dev/e/20060424012836.GC19550%40quicksilver.road.mcmartin.ca In-Reply-To: <7vy7xvdb3x.fsf@assigned-by-dhcp.cox.net> ``` On Sun, Apr 23, 2006 at 06:18:58PM -0700, Junio C Hamano wrote: > "David S. Miller" writes: > > > Updating from f4ffaa452e71495a06376f12f772342bc57051fc to 6b426e785cb81e53dc2fc4dcf997661472b470ef > > Fast forward > > MAINTAINERS | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > > > I got 446 objects and this amounted to just a 4 line change to the > > MAINTAINERS file? :-) > > That is weird, certainly, and does not match what I am getting... > Hmm, I saw this when I did a git diff linus..master on my tree on hera before I sent the pull request, but when I did git request-pull it had All The Right Stuff (tm), so I assumed I just mucked something up with my command-line options. When I looked at the tree in gitk, everything looked sane as well. Hope I didn't break anything... Cheers, Kyle ``` ## Sergey Vlasov, 2006-04-24 09:29 Subject: Re: weird pull behavior as of late Message-ID: <20060424132922.6e634188.vsu@altlinux.ru> URL: https://gitlist.dev/e/20060424132922.6e634188.vsu%40altlinux.ru In-Reply-To: <20060423.175953.52710961.davem@davemloft.net> ``` On Sun, 23 Apr 2006 17:59:53 -0700 (PDT) David S. Miller wrote: > Fast forward > MAINTAINERS | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > I got 446 objects and this amounted to just a 4 line change to the > MAINTAINERS file? :-) I got the same problem recently and tracked it down to a stale diff.o object file inside libgit.a - apparently "ar rcs" does not recreate the archive from scratch. After "make clean" the problem has vanished. ``` ## David S. Miller, 2006-04-24 19:46 Subject: Re: weird pull behavior as of late Message-ID: <20060424.124600.93277140.davem@davemloft.net> URL: https://gitlist.dev/e/20060424.124600.93277140.davem%40davemloft.net In-Reply-To: <20060424132922.6e634188.vsu@altlinux.ru> ``` From: Sergey Vlasov Date: Mon, 24 Apr 2006 13:29:22 +0400 > On Sun, 23 Apr 2006 17:59:53 -0700 (PDT) David S. Miller wrote: > > > Fast forward > > MAINTAINERS | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > > > I got 446 objects and this amounted to just a 4 line change to the > > MAINTAINERS file? :-) > > I got the same problem recently and tracked it down to a stale diff.o > object file inside libgit.a - apparently "ar rcs" does not recreate the > archive from scratch. After "make clean" the problem has vanished. Thanks, I'll give that a try. ```