Bug 38393 - specifying both --git-commit and --squash should throw an error
Summary: specifying both --git-commit and --squash should throw an error
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC OS X 10.5
: P2 Normal
Assignee: Nobody
Depends on:
Reported: 2010-04-30 10:44 PDT by Ojan Vafai
Modified: 2010-05-24 15:34 PDT (History)
3 users (show)

See Also:


Note You need to log in before you can comment on or make changes to this bug.
Description Ojan Vafai 2010-04-30 10:44:42 PDT
--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.
Comment 1 Chris Jerdonek 2010-04-30 11:51:04 PDT
Is this for webkit-patch or check-webkit-style?  IIRC, check-webkit-style also has these two options.
Comment 2 Ojan Vafai 2010-04-30 12:02:49 PDT
Comment 3 Ojan Vafai 2010-05-24 15:34:20 PDT
We've decided to replace --squash with --git-commit=*.