Bug 40652 – webkit-patch land generates an incorrect commit message

• Status: NEW
• Component: Tools / Tests

[Yuzo Fujishima]

I've committed
  http://trac.webkit.org/changeset/61232
with
  webkit-patch land --ignore-builders

The commit message was incorrect -- it includes change logs for other changes.


More specifically, I did the following:

git checkout master
git svn rebase
git rebase master <mybranch>
git reset HEAD^
git add <newfiles>
webkit-patch land --ignore-builders

Please note that I didn't do resolve-ChangeLogs because
git rebase didn't complain of conflicts. This could be a factor.

Maybe I made some stupid mistake, but I'd appreciate it if anyone can investigate.

[Yuzo Fujishima]

The diff for WebCore/ChangeLog was not from the beginning of the file.
That might be the cause?

[Csaba Osztrogonác]

One more fail: http://trac.webkit.org/changeset/74897
Eric, could you check it please?

[Eric Seidel (no email)]

webkit-patch land is supposed to warn when ChangeLog diffs start further than 8 lines into the file.

[Eric Seidel (no email)]

See http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/tool/steps/validatechangelogs.py#L37

[Mihai Parparita]

In the case of http://trac.webkit.org/changeset/74897, the problem could've been when I did a "git svn rebase" which auto-merged ChangeLog diffs with resolve-ChangeLogs, which shares no code with webkit-patch.

[Eric Seidel (no email)]

Sure, but if you used webkit-patch land to do the commit, then the ValidateChangeLogs step would have run, and that check should have failed, prompting you to check your diff.

However it's very possible that either the DiffParser or the logic in that step is wrong.