Skip to content

Revert "Merge pull request #239"#248

Merged
derrickstolee merged 1 commit intomicrosoft:masterfrom
derrickstolee:log-location
Nov 22, 2019
Merged

Revert "Merge pull request #239"#248
derrickstolee merged 1 commit intomicrosoft:masterfrom
derrickstolee:log-location

Conversation

@derrickstolee
Copy link
Contributor

@derrickstolee derrickstolee commented Nov 21, 2019

@kewillford noticed that the perf builds started failing after #239 merged. Revert it for now, and I'll investigate tomorrow.

…ment root"

This reverts commit 0b1cae6, reversing
changes made to 146ebe4.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
@derrickstolee derrickstolee changed the title Revert "Merge pull request #239 Revert "Merge pull request #239" Nov 21, 2019
@derrickstolee
Copy link
Contributor Author

@kewillford if you are still around when builds are green, please merge this. I'll be offline the rest of the night.

@kewillford
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@derrickstolee derrickstolee merged commit 0927d0c into microsoft:master Nov 22, 2019
derrickstolee added a commit that referenced this pull request Nov 26, 2019
This replaces #239 which was reverted in #248.

The only change is the algorithm for finding the enlistment root. The previous algorithm had an issue when called from the `src` folder as it would create the enlistment root there and then the `ScalarEnlistment` class still automatically added `src` to that for the working directory root.

This was not caught by the functional tests because they run the maintenance verbs from the enlistment root, not the `src` folder. I didn't catch it in testing because my local testing was from the old mechanism using `git config` instead. The performance test suite does reveal this problem.

As a follow-up, we should remove the "working directory backing root" (#250).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants