Re: git/cscope with x86 merge

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Sam Ravnborg <sam@...>
Cc: Yinghai Lu <yhlu.kernel@...>, Andi Kleen <ak@...>, Thomas Gleixner <tglx@...>, Ingo Molnar <mingo@...>, Andrew Morton <akpm@...>, Linux Kernel Mailing List <linux-kernel@...>
Date: Saturday, October 20, 2007 - 2:19 pm

On Sat, 20 Oct 2007, Sam Ravnborg wrote:

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 rename, because of the fact that the

	arch/x86_64/kernel/vmlinux.lds.S

file actually *remained*, so it wasn't really a rename. It just got almost 
all of its data changed.

So there was never really a rename: there was a "copy" and a "rewrite". 
And "git --follow" doesn't follow copies.

However, "git blame" does do so. So if you do

	git blame -C arch/x86/kernel/vmlinux_64.lds.S

(where that -C tells it to follow data across file copies), it will 
actually show the history down, line for line!

But when you try to follow the history of the whole *file*, git sees that 
the filename still existed of the source, so it won't consider that a 
candidate for renames!

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. (But one of the advantages of the git model 
is that none of this is hardcoded in the repository data itself, so we can 
improve the rename following and it will automatically work with any repo, 
even one created with older git versions)

		Linus
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git/cscope with x86 merge, Yinghai Lu, (Mon Oct 15, 3:45 pm)
Re: git/cscope with x86 merge, Linus Torvalds, (Mon Oct 15, 4:00 pm)
Re: git/cscope with x86 merge, Yinghai Lu, (Sat Oct 20, 5:40 am)
Re: git/cscope with x86 merge, Linus Torvalds, (Sat Oct 20, 11:56 am)
Re: git/cscope with x86 merge, Sam Ravnborg, (Sat Oct 20, 12:47 pm)
Re: git/cscope with x86 merge, Thomas Gleixner, (Sat Oct 20, 1:39 pm)
Re: git/cscope with x86 merge, Linus Torvalds, (Sat Oct 20, 2:19 pm)
Re: git/cscope with x86 merge, Linus Torvalds, (Sat Oct 20, 2:49 pm)
Re: git/cscope with x86 merge, Sam Ravnborg, (Sat Oct 20, 3:15 pm)
Re: git/cscope with x86 merge, Linus Torvalds, (Sat Oct 20, 3:36 pm)
Re: git/cscope with x86 merge, Sam Ravnborg, (Sat Oct 20, 4:10 pm)
Re: git/cscope with x86 merge, Andi Kleen, (Sat Oct 20, 4:44 pm)
Re: git/cscope with x86 merge, Linus Torvalds, (Sat Oct 20, 5:45 pm)
Re: git/cscope with x86 merge, Dave Jones, (Mon Oct 15, 4:01 pm)