[Webkit-unassigned] [Bug 28725] New: resolve-ChangeLogs: determineVCSRoot() returns incorrect repository root during git filter-branch

[bugzilla-daemon at webkit.org]

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

           Summary: resolve-ChangeLogs: determineVCSRoot() returns
                    incorrect repository root during git filter-branch
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Other
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: ddkilzer at webkit.org
                CC: aroben at apple.com, pkasting at google.com



David Kilzer (ddkilzer) <ddkilzer at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #38581|                            |review?
               Flag|                            |


Created an attachment (id=38581)
 --> (https://bugs.webkit.org/attachment.cgi?id=38581)
Patch v1

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(-)

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