[Webkit-unassigned] [Bug 95314] New: webkit-patch land-cowboy displays a working copy diff, but tries to commit the diff against upstream

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Wed Aug 29 02:05:19 PDT 2012


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

           Summary: webkit-patch land-cowboy displays a working copy diff,
                    but tries to commit the diff against upstream
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: jochen at chromium.org
                CC: antonm at chromium.org


steps to reproduce:

1) checkout some arbitrary commit
2) branch off of that commit
3) change a file
4) webkit-patch land-cowboy

this will create a ChangeLog entry for that change and display the diff, but then it tries to commit something else:

$ webkit-patch land-cowboy
Total errors found: 0 in 2 files
Was that diff correct? [Y/n]: 
There are 32 local commits and working copy changes. Everything will be committed as a single commit. To avoid this prompt, set "git config webkit-patch.commit-should-always-squash true". [Y/n]:

I'd expect it to land exactly that diff it displayed, or bail out early telling me that it doesn't want to commit from my fancy branch

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



More information about the webkit-unassigned mailing list