Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > On Sat, 23 Feb 2008, Junio C Hamano wrote: > >> Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: >> >> > So I find it irritating when git thinks for a long time without telling me >> > what's taking so long. And by "long time" I definitely mean less than two >> > seconds, which is already way too long for me. >> >> Do you mean more than two or less than two? > > I mean that "long time" starts at a point that is less than two seconds. > > Anything over a second is a long time for me. > >> Geez you are impatient ;-). > > I like to call it "discerning in my time usage". > >> The other user of start_progress_delay uses 95% as cutoff. and >> probably 50% was too low, but that may just be bikeshedding. > > I did think that 50% was a bit low, and considered upping it to 75, but > with the one-second thing it wasn't as much of a deal any more. > >> I agree. Perhaps we can add some message when "-m" codepath >> falls back to the three-way merge to make "merge-error" less >> scary. Perhaps like: > > Sounds sane to me. Ok, then. Unfortunately it will be short-lived on 'master' as I have been planning to merge Daniel's rewrite soon ;-) - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html