Bug 32730 - webkit-patch post-commits should have a --squash option
Summary: webkit-patch post-commits should have a --squash option
Status: RESOLVED WONTFIX
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
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-12-18 12:17 PST by Eric Seidel (no email)
Modified: 2011-03-21 22:02 PDT (History)
5 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel (no email) 2009-12-18 12:17:25 PST
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.
Comment 1 Dirk Pranke 2009-12-18 12:20:03 PST
perhaps the best way to do it is to create a local branch, squash to that branch, and then submit that single commit?
Comment 2 Eric Seidel (no email) 2009-12-18 12:26:13 PST
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.
Comment 3 Dirk Pranke 2009-12-18 12:28:56 PST
Yeah, I would think that that would be reasonable.
Comment 4 Eric Seidel (no email) 2009-12-29 10:52:22 PST
Anyone looking at this bug should be aware of bug 33023 too.
Comment 5 Eric Seidel (no email) 2011-03-21 17:54:04 PDT
I'm not sure this bug is even valid anymore.
Comment 6 Ojan Vafai 2011-03-21 22:02:32 PDT
Me neither. Until someone has a problem, we can leave this closed. :)