Bug 36143 - webkit-patch upload should detect local commits and suggest git reset --soft
Summary: webkit-patch upload should detect local commits and suggest git reset --soft
Status: NEW
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: 2010-03-15 15:01 PDT by Eric Seidel (no email)
Modified: 2010-03-17 14:38 PDT (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel (no email) 2010-03-15 15:01:45 PDT 
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.
Comment 1 Dirk Pranke 2010-03-17 14:38:15 PDT 
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).