Skip to content

Fix/possible infinite inherit #1336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Dec 5, 2017
Merged

Fix/possible infinite inherit #1336

merged 3 commits into from
Dec 5, 2017

Conversation

JakeGinnivan
Copy link
Contributor

No description provided.

Jake Ginnivan added 2 commits December 4, 2017 18:20
Should use targetBranch.Tip instead of CurrentCommit to give merge co…
26f85a0 
…mmit PRs a better chance of resolving
There is a scenario where no config is resolved during branch inheirt…
4b8cb31 
…ance, this falls back to default config, which is inherit.

This causes infinite recursion. This fixes GitTools#1195
@JakeGinnivan
Copy link
Contributor Author

I have tried writing tests for this, I can only reproduce on my build server and cannot figure how I end up with these logs:

[15:55:31][Step 2/2]   INFO [12/04/17 7:55:31:84] Found possible parent branches: 
[15:55:31][Step 2/2]   WARN [12/04/17 7:55:31:84] Failed to inherit Increment branch configuration, no branches found.
[15:55:31][Step 2/2] 
[15:55:31][Step 2/2] Falling back to origin/master branch config
[15:55:31][Step 2/2]   INFO [12/04/17 7:55:31:84] No branch configuration found for branch origin/master, falling back to default configuration

However TeamCity is setting up the repo it's causing an issue when building BitBucket pull requests /merge target.

@JakeGinnivan JakeGinnivan force-pushed the fix/PossibleInfiniteInherit branch from e7d5417 to 4c5d53e Compare December 5, 2017 14:30
@JakeGinnivan JakeGinnivan merged commit 0f7e7b3 into GitTools:master Dec 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@JakeGinnivan