Bug 95314
| Summary: | webkit-patch land-cowboy displays a working copy diff, but tries to commit the diff against upstream | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | jochen |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | NEW | ||
| Severity: | Normal | CC: | antonm |
| Priority: | P2 | ||
| Version: | 528+ (Nightly build) | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
jochen
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
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |