[webkit-dev] git history and the moving to Source

Evan Martin evan at chromium.org
Tue Jan 4 10:42:05 PST 2011


git-svn appears to use -C (which implies -M) by default.
See "sub generate_diff" in .../libexec/git-core/git-svn.

On Tue, Jan 4, 2011 at 2:50 AM, Balazs Kelemen <kbalazs at webkit.org> wrote:
> That works, thank you guys!
> By the way, don't you think the -M switch for git diff should be used by
> webkit-patch?
> It's much easier to review a patch with rename and changes with the rename
> detection.
>
> On 01/04/2011 07:26 AM, Evan Martin wrote:
>>
>> Adam is correct.
>>
>> To elaborate, there are two rename-related flags of interest:
>>
>> 1) When you git log -- foo/bar.cc, you're saying "only show me logs
>> that apply to the path foo/bar.cc".  This excludes renames implicitly.
>>  The --follow flag indicates that the filename filter should be
>> broadened to include renames.
>>
>> 2) If you are viewing diffs (like with -p), you must pass -M etc. just
>> as you would to git diff for it to find renames.
>>
>> Here's an interesting thread from Linus on the subject:
>>   http://kerneltrap.org/mailarchive/git/2009/1/30/4856404/thread
>> As usual, his opinions on renames are ...interesting.
>>
>> On Mon, Jan 3, 2011 at 5:56 PM, Adam Barth<abarth at webkit.org>  wrote:
>>>
>>> There's a git option to follow renames.  I think it's --follow, but
>>> some git experts might know better.
>>>
>>> Adam
>>>
>>>
>>> On Mon, Jan 3, 2011 at 5:53 PM, Balazs Kelemen<kbalazs at webkit.org>
>>>  wrote:
>>>>
>>>> I have just realized that git log -- filename does not output the
>>>> history before the file had been moved to Source. It seems like the
>>>> whole git history will be lost after the move. Did we take this into
>>>> consideration when we decided to switch to the new directory  structure?
>>>> Can we do something to save the history? Or should I just
>>>> do something locally to fix this?
>>>>
>>>> Balazs
>>>>
>>>>
>>>> _______________________________________________
>>>> webkit-dev mailing list
>>>> webkit-dev at lists.webkit.org
>>>> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
>>>>
>>> _______________________________________________
>>> webkit-dev mailing list
>>> webkit-dev at lists.webkit.org
>>> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
>>>
>
> _______________________________________________
> webkit-dev mailing list
> webkit-dev at lists.webkit.org
> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
>


More information about the webkit-dev mailing list