[webkit-dev] webkit-patch, check-webkit-style and git now support --squash and --git-commit

[David Kilzer]

On Fri, May 14, 2010 at 6:29:05 PM, Ojan Vafai wrote:

> tonikitoo, aroben, ddkilzer: You are the three who I remember
> voicing yourselves about wanting webkit-patch to support
> committing/uploading multiple patches from the same branch.
> Would Chris's suggestion below (last couple paragraphs) be
> acceptable to you? I prefer it as it makes webkit-patch less
> confusing to people who aren't very comfortable with git, but
> it does not 100% meet the needs you've asked for in the past.


Since webkit-patch doesn't meet my needs for posting a "patch series" to a single bug today, I have no opinion either way on the matter other than "simpler is better", so I would support Chris' suggestion.

Personally, I don't see why both models (single patches and multiple patches) couldn't be supported based on the arguments passed to webkit-patch.  git itself seems to be able to figure out if the user is referring to a single commit or a series of commits (based on the context of the command-line arguments and what the command does), so I don't see why we have to introduce additional command-line switches for various behavior. (See the git-send-email command as an example since it's designed to send email for a single patch or a series of patches.)

In my opinion, webkit-patch should default to single commit behavior unless the user specifies a range.  That way, git neophytes and the majority of existing users get the single-commit-to-a-single-bug behavior by default.  However, if a range of commits is given, then webkit-patch would be smart enough to post the series of patches to a single bug.

Dave