[webkit-reviews] review requested: [Bug 28725] resolve-ChangeLogs: determineVCSRoot() returns incorrect repository root during git filter-branch : [Attachment 38581] Patch v1

[bugzilla-daemon at webkit.org]

David Kilzer (ddkilzer) <ddkilzer at webkit.org> has asked  for review:
Bug 28725: resolve-ChangeLogs: determineVCSRoot() returns incorrect repository
root during git filter-branch
https://bugs.webkit.org/show_bug.cgi?id=28725

Attachment 38581: Patch v1
https://bugs.webkit.org/attachment.cgi?id=38581&action=review

------- Additional Comments from David Kilzer (ddkilzer) <ddkilzer at webkit.org>
Reviewed by NOBODY (OOPS!).

When git-filter-branch has been invoked to rewrite ChangeLog
files on series of git commits, it changes directories into
.git-rewrite/t before re-running resolve-ChangeLogs.  This
causes determineVCSRoot() in VCSUtils.pm to return
".git-rewrite/t", which causes that path to be prepended to all
ChangeLog paths, which results in an error like this:

error: pathspec '.git-rewrite/t/ChangeLog' did not match any file(s) known to
git.
Died at WebKitTools/Scripts/resolve-ChangeLogs line 376.

The correct way to fix this is not to try to find the repository
root when invoked by git-filter-branch.

* Scripts/resolve-ChangeLogs: If isInGitFilterBranch() is true,
set $relativePath to '.' instead of calling
chdirReturningRelativePath(determineVCSRoot()).
(isInGitFilterBranch): Added.  Checks for the existence of the
MAPPED_PREVIOUS_COMMIT environment variable.
---
 2 files changed, 32 insertions(+), 1 deletions(-)