Re: git/cscope with x86 merge

2007-10-20 Thread Sam Ravnborg
On Sat, Oct 20, 2007 at 12:36:17PM -0700, Linus Torvalds wrote: > > > On Sat, 20 Oct 2007, Sam Ravnborg wrote: > > > > I pulled next branch of git and applied your patch. > > > > When running > > git log --follow -B arch/x86/kernel/vmlinux_64.lds.S > > > > I got no output at all (in a newl

Re: git/cscope with x86 merge

2007-10-20 Thread Andi Kleen
> Try with "-p". > > It's possible (nay, likely) that "next" has the bug where "--follow" > without a patch generating thing (-p or --stat or one of the other flags > that enable diffs) doesn't work at all. It's not only next. The latest release (1.5.3.4) has this problem. -Andi - To unsubscr

Re: git/cscope with x86 merge

2007-10-20 Thread Linus Torvalds
On Sat, 20 Oct 2007, Sam Ravnborg wrote: > > I pulled next branch of git and applied your patch. > > When running > git log --follow -B arch/x86/kernel/vmlinux_64.lds.S > > I got no output at all (in a newly pulled linux kernel dir). Try with "-p". It's possible (nay, likely) that "nex

Re: git/cscope with x86 merge

2007-10-20 Thread Linus Torvalds
On Sat, 20 Oct 2007, Andi Kleen wrote: > > It's not only next. The latest release (1.5.3.4) has this problem. Yes. It's ok in the master branch, but due to unlucky timing with noticing this bug, and Junio being away, no releases got cut with the fix. In general, the kernel people haven't don

Re: git/cscope with x86 merge

2007-10-20 Thread Sam Ravnborg
On Sat, Oct 20, 2007 at 11:49:51AM -0700, Linus Torvalds wrote: > > > On Sat, 20 Oct 2007, Linus Torvalds wrote: > > > > I could perhaps look at making "git log --follow" also break up files that > > got totally rewritten (git already has a notion of "-B" to do that), but > > no, we don't do i

Re: git/cscope with x86 merge

2007-10-20 Thread Linus Torvalds
On Sat, 20 Oct 2007, Linus Torvalds wrote: > > I could perhaps look at making "git log --follow" also break up files that > got totally rewritten (git already has a notion of "-B" to do that), but > no, we don't do it right now. Ok, if you guys have a current git source, and want to try some

Re: git/cscope with x86 merge

2007-10-20 Thread Linus Torvalds
On Sat, 20 Oct 2007, Sam Ravnborg wrote: > > But you do not see the rename arch/x86_64/kernel/{vmlinux.lds.S => > vmlinux.lds.S} Umm. What you are describing isn't a rename - that's the same name. Do you perhaps mean vmlinux.lds.S => vmlinux_64.lds.S ? And yes, it doesn't show that as a rena

Re: git/cscope with x86 merge

2007-10-20 Thread Thomas Gleixner
On Sat, 20 Oct 2007, Sam Ravnborg wrote: > On Sat, Oct 20, 2007 at 08:56:18AM -0700, Linus Torvalds wrote: > > so it definitely works for me. > > But you do not see the rename arch/x86_64/kernel/{vmlinux.lds.S => > vmlinux.lds.S} > And this is I thing the important step here. > > For vmlinux.lds

Re: git/cscope with x86 merge

2007-10-20 Thread Sam Ravnborg
On Sat, Oct 20, 2007 at 08:56:18AM -0700, Linus Torvalds wrote: > > > On Sat, 20 Oct 2007, Yinghai Lu wrote: > > > > git log -p --follow arch/x86/kernel/vmlinux_64.lds.S > > > > can not trace to arch/x86_64/kernel/vmlinux.lds.S > > Hmm. I get: > > [EMAIL PROTECTED] linux]$ git log --sta

Re: git/cscope with x86 merge

2007-10-20 Thread Linus Torvalds
On Sat, 20 Oct 2007, Yinghai Lu wrote: > > git log -p --follow arch/x86/kernel/vmlinux_64.lds.S > > can not trace to arch/x86_64/kernel/vmlinux.lds.S Hmm. I get: [EMAIL PROTECTED] linux]$ git log --stat --follow arch/x86/kernel/vmlinux_64.lds.S commit 250c22777fe1ccd7ac588579

Re: git/cscope with x86 merge

2007-10-20 Thread Yinghai Lu
On 10/15/07, Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > On Mon, 15 Oct 2007, Yinghai Lu wrote: > > > > after the merge: > > 1. git > > git log -p arch/x86/kernel/io_apic_64.c > > only can show the log from the merge..., and can not get log before > > merge for x86_64/kernel/io_apic.c > > Any g

Re: git/cscope with x86 merge

2007-10-15 Thread Linus Torvalds
On Mon, 15 Oct 2007, Yinghai Lu wrote: > > after the merge: > 1. git > git log -p arch/x86/kernel/io_apic_64.c > only can show the log from the merge..., and can not get log before > merge for x86_64/kernel/io_apic.c > Any git update for that? Use git log -p --follow arch/x86/kernel/io_

Re: git/cscope with x86 merge

2007-10-15 Thread Dave Jones
On Mon, Oct 15, 2007 at 12:45:27PM -0700, Yinghai Lu wrote: > after the merge: > 1. git > git log -p arch/x86/kernel/io_apic_64.c > only can show the log from the merge..., and can not get log before > merge for x86_64/kernel/io_apic.c > Any git update for that? add --follow to your command

git/cscope with x86 merge

2007-10-15 Thread Yinghai Lu
after the merge: 1. git git log -p arch/x86/kernel/io_apic_64.c only can show the log from the merge..., and can not get log before merge for x86_64/kernel/io_apic.c Any git update for that? 2. cscope on x86_64, it is good to see file in arch/x86/pci/* but will show other _32.c too. So is it possi