Bug 33309

Summary: webkit-patch complains about working directory having local commits if remote branch is ahead of HEAD
Product: WebKit Reporter: Eric Seidel (no email) <eric>
Component: Tools / TestsAssignee: Nobody <webkit-unassigned>
Status: NEW ---    
Severity: Normal CC: evan
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: PC   
OS: OS X 10.5   

Description Eric Seidel (no email) 2010-01-06 23:20:37 PST
bugzilla-tool complains about working directory having local commits if remote branch is ahead of HEAD

> git svn fetch
> bugzilla-tool build
ERROR: Working directory has local commits, pass --force-clean to continue.

http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/scm.py#L390 is the culprit i'm sure.

        return run_command(['git', 'log', '--pretty=oneline', 'HEAD...trunk']).splitlines()
Comment 1 Evan Martin 2010-01-07 09:05:00 PST
HEAD...trunk when passed to git log means "all commits on either branch that are not shared by the other".  If you want "trunk commits that are not on HEAD", that's HEAD..trunk.  Yes, this is entirely different than the syntax for git diff.  Go open source.  :(
Comment 2 Eric Seidel (no email) 2010-01-19 17:01:02 PST
This is a one character change.  I just don't know how to easily write the tests.