Bug 38393
| Summary: | specifying both --git-commit and --squash should throw an error | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Ojan Vafai <ojan> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | RESOLVED WONTFIX | ||
| Severity: | Normal | CC: | cjerdonek, eric, jamesr |
| Priority: | P2 | ||
| Version: | 528+ (Nightly build) | ||
| Hardware: | PC | ||
| OS: | OS X 10.5 | ||
Ojan Vafai
--git-commit will squash all the commits in the commit range into one. --squash grabs the full diff from trunk. The two are currently mutually exclusive.
You could also imagine a world in which git-commit was more like dcommit (treats each commit in the range as a separate patch). If we did that, then it would make sense to allow both. In other words, ideally, --git-commit would only treat the commit range as a single patch if you also specified --squash.
But, since the code currently squashes, I think we should throw an error for now if you specify both and add a FIXME for the git-commit behavior.
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Chris Jerdonek
Is this for webkit-patch or check-webkit-style? IIRC, check-webkit-style also has these two options.
Ojan Vafai
Both
Ojan Vafai
We've decided to replace --squash with --git-commit=*.