Bug 50424

Summary: make webkit-patch command work when the git branch is not synced to the remote svn branch
Product: WebKit Reporter: Ojan Vafai <ojan>
Component: New BugsAssignee: Ojan Vafai <ojan>
Status: RESOLVED FIXED    
Severity: Normal CC: abarth, aroben, eric, evan
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Other   
OS: OS X 10.5   
Attachments:
Description Flags
Patch eric: review+

Description Ojan Vafai 2010-12-02 16:56:00 PST
make webkit-patch command work when the git branch is not synced to the remote svn branch
Comment 1 Ojan Vafai 2010-12-02 16:59:20 PST
Created attachment 75436 [details]
Patch
Comment 2 Adam Barth 2010-12-02 17:11:53 PST
Comment on attachment 75436 [details]
Patch

Looks plausible to me, but we might want a git ninja's opinion.
Comment 3 Eric Seidel (no email) 2010-12-02 17:14:52 PST
Comment on attachment 75436 [details]
Patch

I don't really understand, but I believe you.
Comment 4 Eric Seidel (no email) 2010-12-02 17:15:29 PST
Would be nice to hear from a git ninja, but I'm not sure they'll understand what this change does any better than I do.

Do we need to test the case where the commit would fail due to lack of update?  Or is that orthogonal to this change?
Comment 5 Ojan Vafai 2010-12-02 18:42:00 PST
(In reply to comment #4)
> Would be nice to hear from a git ninja, but I'm not sure they'll understand what this change does any better than I do.
> 
> Do we need to test the case where the commit would fail due to lack of update?  Or is that orthogonal to this change?

That's what the three modified tests are. They used to verify that we'd throw a ScriptError in those cases. Now they verify we committed the right files and not other files. Good test coverage ftw!
Comment 6 Ojan Vafai 2010-12-06 11:33:28 PST
Oh, I misread that...actually, you're right, we don't test the case where the commit would fail (e.g. because of a conflict). I'll add that test and commit.
Comment 7 Ojan Vafai 2010-12-06 12:00:47 PST
Committed r73384: <http://trac.webkit.org/changeset/73384>