lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] ide: Fix bug caused by git merge
Date
Linus Torvalds <torvalds@linux-foundation.org> writes:

> Junio - what made it harder for Steven to see the reason may be due
> the default history simplification. I do wonder if we should just make
> "--simplify-merges" the default, because the aggressive and simple
> default culling makes it hard to see merge commits like this that just
> pick one side over the other. --simplify-merges is more expensive,
> but doesn't have some of the problems the aggressive simplification
> has.

It is more expensive not just in computation cycles but in latency, as it
is inherently a "limited" operation that needs to first walk the history
and then post-process.

$ time sh -c 'git log drivers/ide/ide-cd.c | head -n 200 >/dev/null'

with and without "--simplify-merges" shows more than 50-fold differences
(0.15s vs 8s).

I am more disturbed by the fact that "git show 698567f3fa7" does not show
the mismerge (even with -c). Of course I know that not showing "taking
from one side" is by design of -c/--cc, but I still feel there should be
something we could do about it.


\
 
 \ /
  Last update: 2011-06-01 23:57    [W:0.059 / U:1.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site