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

git-annex in a separate branch #67

Open
kousu opened this issue Apr 12, 2021 · 2 comments
Open

git-annex in a separate branch #67

kousu opened this issue Apr 12, 2021 · 2 comments

Comments

@kousu
Copy link
Member

kousu commented Apr 12, 2021

  • is incompatible with Github's pull request UI, because that assumes (fairly!) that all the changes for a branch are confined to one branch
  • is easy to forget to upload add site data ucdavis spine-generic/data-multi-subject#77 (comment)
  • is merged out-of-order; different repos end up with different histories in their git-annex branches as they sync with each other in different orders.
@kousu
Copy link
Member Author

kousu commented Apr 13, 2021

Maybe we should have everyone

git config --global remote.origin.annex-speculate-present true
git config --global remote.amazon.annex-speculate-present true
git config --global annex.alwayscommit false # don't write to `git-annex`

That should reduce our need for the git-annex branch.

We do need it when we add new remotes. But that's pretty rare, that only happens with our public datasets and we (well, probably, I) can make sure to handle uploading git-annex in that case.

In fact, if we also avoid git annex sync, we'll never change the git-annex branch at all, I think.

@kousu
Copy link
Member Author

kousu commented Nov 29, 2021

Bitten by this today in spine-generic/data-multi-subject#108, where a friend tried to work with a Github Fork, which does not sync the git-annex branch the way git annex thinks it should.

In this case, they weren't trying to contribute, they just wanted to download. But they'd forked a while ago, and so their git-annex branch was out of date, causing failures.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant