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

Determine remote using git-config when branch.<name>.merge option is set #35

Merged
merged 4 commits into from
Aug 18, 2022

Conversation

plt-amy
Copy link
Contributor

@plt-amy plt-amy commented Aug 17, 2022

Fixes obsidiansystems/obelisk#792: When branch.master.merge is set, for-each-ref doesn't print the remote, but we can piece the remote ref together by looking at $(git config branch.master.remote)/$(git config branch.master.merge).

@plt-amy plt-amy self-assigned this Aug 17, 2022
@plt-amy plt-amy force-pushed the aliao/branch-merge-config branch from 39cb1e4 to d4b27ff Compare August 17, 2022 21:50
@plt-amy plt-amy changed the title Determine remote using git-branch when branch.<name>.merge option is set Determine remote using git-config when branch.<name>.merge option is set Aug 18, 2022
blocked on merging #34 since I used 0.6.0.0 for the version
@plt-amy plt-amy force-pushed the aliao/branch-merge-config branch from e1aad8e to 9127b24 Compare August 18, 2022 18:58
@plt-amy plt-amy requested a review from madeline-os August 18, 2022 18:59
Copy link
Contributor

@madeline-os madeline-os left a comment

Choose a reason for hiding this comment

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

Looks good. Can we get an automated test?

src/Nix/Thunk.hs Outdated Show resolved Hide resolved
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.

ob init fails when git option branch.master.merge is set
2 participants