[Webkit-unassigned] [Bug 36394] Include git commits in the diff for webkit-patch upload/land.

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=36394





--- Comment #22 from Chris Jerdonek <cjerdonek at webkit.org>  2010-03-28 20:49:47 PST ---
(In reply to comment #15)

[Re-ordering parts of the comment for better readability.]

I can't say I use webkit-patch a whole lot yet (mostly because of workflow
issues), but I have to agree with David.

> The new state lets you have multiple local commits that get uploaded as a
> single patch and get committed as a single commit.  This allows people to have
> workflows where they actually use git's ability to do local commits without
> needing to do a bunch of reset/rebase junk in order to upload/land a patch.

Do many people use this workflow?  I was when I first started using git, but
that was before I found about "git-commit --amend".  In my experience, the
--amend option has for the most part eliminated the need for me to squash
locally.

For me it's more common that I would want to upload only the most recent one of
several local commits rather than a bunch at once.  This is when I'd like to
have "serial patches" reviewed separately -- i.e. consecutive patches that
depend on the previous being landed.

It seems like WebKit's processes (e.g. ChangeLogs) discourage spreading patches
across several commits.  And because WebKit favors small patches anyways, it
seems like such commits should perhaps be landed separately, too.

> Basically, the current state of the world only works if you keep all your
> changes in the working copy. In order to upload or commit, you need to "git
> reset trunk" or some equivalent action.

If I understand webkit-patch's capabilities correctly, one thing I think I do
agree with you on is wanting the ability to land the most recent local commit
-- rather than having to "reset" the most recent local commit into the working
directory before landing, etc.  Let me know if I'm misunderstanding anything. 
Thanks.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.