Bug 32730
| Summary: | webkit-patch post-commits should have a --squash option | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Eric Seidel (no email) <eric> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | RESOLVED WONTFIX | ||
| Severity: | Normal | CC: | abarth, aroben, dpranke, evan, ojan |
| Priority: | P2 | ||
| Version: | 528+ (Nightly build) | ||
| Hardware: | PC | ||
| OS: | OS X 10.5 | ||
Eric Seidel (no email)
bugzilla-tool post-commits should have a --squash option
Right now if you have multiple local commits and you want to upload them to bugzilla, you need to do a manual reset locally.
I'm not entirely sure how this would work. Especially if you listed a cherry-pick set of commits.
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Dirk Pranke
perhaps the best way to do it is to create a local branch, squash to that branch, and then submit that single commit?
Eric Seidel (no email)
What I'm not clear on is what to do with the arguments passed to post-commits. post-commits takes cherry-pick arguments, so I guess we'd have to:
1. save the user's state (record the current head, and stash)
2. create a new branch from "trunk"
3. pass the post-commits arguments to cherry-pick
4. git reset --soft
5. call post-diff
6. restore the user's state.
We could get rid of step 6 and most of step 1 by requiring a clean tree before allowing --squash.
Dirk Pranke
Yeah, I would think that that would be reasonable.
Eric Seidel (no email)
Anyone looking at this bug should be aware of bug 33023 too.
Eric Seidel (no email)
I'm not sure this bug is even valid anymore.
Ojan Vafai
Me neither. Until someone has a problem, we can leave this closed. :)