Re: arch merge fallout.

2007-10-12 Thread Linus Torvalds
On Fri, 12 Oct 2007, Dave Jones wrote: > > $ git log --follow arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c > fatal: ambiguous argument 'arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c': > unknown revision or path not in the working tree. > Use '--' to separate paths from revisions Duh. You need to u

Re: arch merge fallout.

2007-10-12 Thread Dave Jones
On Fri, Oct 12, 2007 at 08:11:53PM -0400, Dave Jones wrote: > On Fri, Oct 12, 2007 at 04:14:54PM -0700, Linus Torvalds wrote: > > > > > > On Fri, 12 Oct 2007, Dave Jones wrote: > > > > > > Something I find useful is to just do for eg.. > > > > > > git log arch/i386/kernel/cpu/cpuf

Re: arch merge fallout.

2007-10-12 Thread Dave Jones
On Fri, Oct 12, 2007 at 04:14:54PM -0700, Linus Torvalds wrote: > > > On Fri, 12 Oct 2007, Dave Jones wrote: > > > > Something I find useful is to just do for eg.. > > > > git log arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c > > > > from time to time, to figure out when certain changes

Re: arch merge fallout.

2007-10-12 Thread Linus Torvalds
On Fri, 12 Oct 2007, Dave Jones wrote: > > Something I find useful is to just do for eg.. > > git log arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c > > from time to time, to figure out when certain changes happened, > or even to grep for something in a changelog. > With that file moved, git refus

Re: arch merge fallout.

2007-10-12 Thread Dave Jones
On Fri, Oct 12, 2007 at 03:43:46PM -0700, Linus Torvalds wrote: > > > On Fri, 12 Oct 2007, Dave Jones wrote: > > > > pull req below. If it turns out to be more trouble than its worth, > > It merged totally automatically, no trouble what-so-ever: > > Renamed arch/i386/kernel/cpu/

Re: arch merge fallout.

2007-10-12 Thread Linus Torvalds
On Fri, 12 Oct 2007, Dave Jones wrote: > > pull req below. If it turns out to be more trouble than its worth, It merged totally automatically, no trouble what-so-ever: Renamed arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c => arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merge

Re: arch merge fallout.

2007-10-12 Thread Dave Jones
On Fri, Oct 12, 2007 at 02:58:24PM -0700, Linus Torvalds wrote: > > > On Fri, 12 Oct 2007, Dave Jones wrote: > > > > The git on master.kernel.org (1.5.3.4) is pretty recent, so I don't think > > that's the problem, is it? > > It may be that the "renamelimit" thing didn't go into the sta

Re: arch merge fallout.

2007-10-12 Thread Linus Torvalds
On Fri, 12 Oct 2007, Dave Jones wrote: > > The git on master.kernel.org (1.5.3.4) is pretty recent, so I don't think > that's the problem, is it? It may be that the "renamelimit" thing didn't go into the stable branch at all. If you build your git from the current HEAD, it should work. Or jus

Re: arch merge fallout.

2007-10-12 Thread Dave Jones
[fixed up Cc list that I dorked previously] On Thu, Oct 11, 2007 at 09:06:42PM -0700, Linus Torvalds wrote> > On Thu, 11 Oct 2007, Dave Jones wrote: > > > > I had hoped that git would be smart(tm) enough to figure out > > that files had moved, and my changes in cpufreq.git would > > somehow