I finally updated this page http://trac.webkit.org/wiki/UsingGitWithWebKit#webkit-patchcheck-webkit-styleandgit .
As is clear from that, my earlier description of --no-squash was totally inaccurate. Sorry, I was being rushed. --no-squash and --git-commit still need significant work before they will work in the way the commit-per-bug camp wants it to. It's not too much work, but it's not trivial either. There are two clear camps with webkit-patch git usage. commit-per-bug and branch-per-bug. webkit-patch should support both. Which one is the default is a matter of preference. The current default is confusing and meets noones needs. I don't care which is the default as long as it's not the current middle-ground. I'd still like to make --squash the default since it is basically complete (except for https://bugs.webkit.org/show_bug.cgi?id=38852 ). There is little active work on --no-squash and --git-commit, so it's not clear how soon they'll be completed. So, unless the are objections, I'd like to do the following: 1. Fix https://bugs.webkit.org/show_bug.cgi?id=38852 2. Pick a date, e.g., June 1st, to make --squash the default. Send many ALL_CAPS emails warning people that the default behavior for webkit-patch and git checkouts is going to change. 3. Change it on June 1st. Which behavior is the default really doesn't matter since you can set webkit-patch.squash in your git config. I just want to get rid of the current default behavior and --no-squash isn't ready for that. Ojan On Mon, Apr 26, 2010 at 9:16 PM, tonikitoo (Antonio Gomes) < [email protected]> wrote: > Hi, > > >> Eventually, I'd like to make --squash the default, but I want this to > bake and get some usage before flipping that switch. > > > > But I don't think this makes sense as a default to me. But maybe I use > git differently than everyone else… I don't do the whole "branch-per-bug" > business. > > > > I usually have one git commit per commit I plan to push to SVN (each with > a separate ChangeLog entry). > > I am also on the same boat, so I do not thing --squash should be the > default. it would be against the current resulting action of <git > push>, <git svn dcommit> and <svn commit>. > > Apart from that, great work! > > -- > --Antonio Gomes >
_______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
