Bug 36143
| Summary: | webkit-patch upload should detect local commits and suggest git reset --soft | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Eric Seidel (no email) <eric> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | NEW | ||
| Severity: | Normal | CC: | abarth, dpranke |
| Priority: | P2 | ||
| Version: | 528+ (Nightly build) | ||
| Hardware: | PC | ||
| OS: | OS X 10.5 | ||
Eric Seidel (no email)
webkit-patch upload should detect local commits and suggest git reset --soft
webkit-patch isn't super git-friendly. I'm not even sure that the "upload" command could be made git-friendly since it may make modifications to the ChangeLog and i'm not sure in a Git world it would make sense to auto-commit those or what?
At least for the time being we should detect that the user has local commits and offer suggestions as to how to use the tool.
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Dirk Pranke
I don't think 'git reset --soft' is the right way to do this; I don't want to lose my local commit history until after I've landed the patch and no longer need it.
I would recommend instead that we do what git-cl does, which is to create a new temporary branch, squash all of the local commits onto that branch, commit that, and then delete the temporary branch (see http://neugierig.org/software/git/?url=git-cl/tree/git-cl, lines 734 - 769 or thereabouts).