Skip to content
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.

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

Allow using .git directory instead of gitdir redirect in submodules. #653

Merged
merged 6 commits into from Aug 12, 2021

Conversation

crummel
Copy link
Contributor

@crummel crummel commented Sep 30, 2020

This is not a scenario for normal git repos, but is still legal, and the Arcade uberclone purposely uses this scenario for minimal SourceLink metadata.

Copy link
Member

@tmat tmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need a test that validates this behavior.

It'd also be useful to document a sequence of git commands that create this kind of repo structure.

@crummel crummel requested a review from tmat October 6, 2020 22:54
@crummel
Copy link
Contributor Author

crummel commented Oct 8, 2020

I think I've addressed your comments @tmat, could you take a look when you have a chance?

Base automatically changed from master to main March 17, 2021 22:33
@crummel
Copy link
Contributor Author

crummel commented Mar 23, 2021

@tmat I think @MichaelSimons is running into this in another case, could you take a look at the PR again?

@MichaelSimons
Copy link
Member

@tmat, @crummel - Friendly ping. Can we get a fix in? This is needed to unblock the offline source-build builds for 6.0

Copy link
Member

@tmat tmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:


var gitDirectory =
Directory.Exists(dotGitPath) ? dotGitPath :
File.Exists(dotGitPath) ? ReadDotGitFile(dotGitPath) :
Copy link
Member

@tmat tmat Aug 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A test is failing - looking at it I think we should keep throwing if the file can't be read, rather then returning null.

var gitDirectory = Directory.Exists(dotGitPath) ? dotGitPath : ReadDotGitFile(dotGitPath);

if (!IsGitDirectory(gitDirectory, out var commonDirectory))
{
    return null;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this change you'd still need to update the Submodules_Errors test - remove case S6:

[submodule ""S6""]             # sub6/.git is a directory, but should be a file
  path = sub6
  url = http://github.com

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or rather update it - since in this case the directory is not a valid git directory (it's empty) so failure is expected of some sort

@tmat
Copy link
Member

tmat commented Aug 12, 2021

@crummel Committed a fix to the test.

@crummel
Copy link
Contributor Author

crummel commented Aug 12, 2021

Thanks! Sorry about that, I got pulled away by some servicing work.

@tmat tmat merged commit 5e2c4f1 into dotnet:main Aug 12, 2021
dariuszkuc pushed a commit to apollographql/federation-hotchocolate that referenced this pull request Oct 13, 2023
…11)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [Microsoft.SourceLink.GitHub](https://togithub.com/dotnet/sourcelink)
| `1.1.0` -> `1.1.1` |
[![age](https://developer.mend.io/api/mc/badges/age/nuget/Microsoft.SourceLink.GitHub/1.1.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/nuget/Microsoft.SourceLink.GitHub/1.1.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/nuget/Microsoft.SourceLink.GitHub/1.1.0/1.1.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/nuget/Microsoft.SourceLink.GitHub/1.1.0/1.1.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>dotnet/sourcelink (Microsoft.SourceLink.GitHub)</summary>

###
[`v1.1.1`](https://togithub.com/dotnet/sourcelink/releases/tag/1.1.1)

[Compare
Source](https://togithub.com/dotnet/sourcelink/compare/1.1.0...1.1.1)

#### Notable Changes

- Feature: GitWeb Source Link provider by
[@&#8203;Glen-Nicol-Garmin](https://togithub.com/Glen-Nicol-Garmin) in
[dotnet/sourcelink#505
- Use submodule.name.url to determine the URL of a submodule by
[@&#8203;tmat](https://togithub.com/tmat) in
[dotnet/sourcelink#587
- Add Microsoft.SourceLink.Tools source package implementing
SourceLinkMap by [@&#8203;tmat](https://togithub.com/tmat) in
[dotnet/sourcelink#663
- Added support for gitea by
[@&#8203;Mik4sa](https://togithub.com/Mik4sa) in
[dotnet/sourcelink#674
- Enable source-build with Arcade SDK fixes by
[@&#8203;dagood](https://togithub.com/dagood) in
[dotnet/sourcelink#692
- Add netstandard2.0 target to tools package by
[@&#8203;tmat](https://togithub.com/tmat) in
[dotnet/sourcelink#702
- Update license to MIT by [@&#8203;tmat](https://togithub.com/tmat) in
[dotnet/sourcelink#730
- Allow using .git directory instead of gitdir redirect in submodules.
by [@&#8203;crummel](https://togithub.com/crummel) in
[dotnet/sourcelink#653
- Fix discovery of working directory for worktrees by
[@&#8203;tmat](https://togithub.com/tmat) in
[dotnet/sourcelink#734
- Add support for the new GitLab raw url by
[@&#8203;rgl](https://togithub.com/rgl) in
[dotnet/sourcelink#713
- Target netcoreapp3.1 by [@&#8203;tmat](https://togithub.com/tmat) in
[dotnet/sourcelink#767

#### New Contributors

- [@&#8203;Glen-Nicol-Garmin](https://togithub.com/Glen-Nicol-Garmin)
made their first contribution in
[dotnet/sourcelink#505
-
[@&#8203;IgorKustov-ChathamFinancial](https://togithub.com/IgorKustov-ChathamFinancial)
made their first contribution in
[dotnet/sourcelink#592
- [@&#8203;v-chmart](https://togithub.com/v-chmart) made their first
contribution in
[dotnet/sourcelink#604
- [@&#8203;0xced](https://togithub.com/0xced) made their first
contribution in
[dotnet/sourcelink#668
- [@&#8203;nycdotnet](https://togithub.com/nycdotnet) made their first
contribution in
[dotnet/sourcelink#672
- [@&#8203;Mik4sa](https://togithub.com/Mik4sa) made their first
contribution in
[dotnet/sourcelink#674
- [@&#8203;rgl](https://togithub.com/rgl) made their first contribution
in
[dotnet/sourcelink#713
- [@&#8203;adiaaida](https://togithub.com/adiaaida) made their first
contribution in
[dotnet/sourcelink#737

**Full Changelog**:
dotnet/sourcelink@1.0.0...1.1.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/apollographql/federation-hotchocolate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy44LjEiLCJ1cGRhdGVkSW5WZXIiOiIzNy44LjEiLCJ0YXJnZXRCcmFuY2giOiJtYWluIn0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.

None yet

4 participants