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

TST: ls_webui: Don't try to add sub-repo without commits #3492

Merged
merged 1 commit into from Jun 26, 2019

Conversation

@kyleam
Copy link
Contributor

@kyleam kyleam commented Jun 26, 2019

As of v2.22.0, Git will refuse to add a repository that doesn't have a
commit checked out.

Closes #3491.

As of v2.22.0, Git will refuse to add a repository that doesn't have a
commit checked out.

Closes datalad#3491.
kyleam added a commit that referenced this issue Jun 26, 2019
Note this is doing some ugly things to the upstream git setup because
of unresolved issues with running the upstream git build on Xenial
rather than Trusty.
@kyleam
Copy link
Contributor Author

@kyleam kyleam commented Jun 26, 2019

A Git v2.22.0 build (with this PR and gh-3493) is set up at: https://travis-ci.org/datalad/datalad/builds/550858203

Running the upstream git build is one of the things I'm battling with over at gh-3476, so the .travis.yml changes in dd2a0f8 aren't pretty, but they hopefully will do for confirming that this passes with the latest Git.

@kyleam
Copy link
Contributor Author

@kyleam kyleam commented Jun 26, 2019

The updated test looks ok in the 2.22.0 build.

@yarikoptic
Copy link
Member

@yarikoptic yarikoptic commented Jun 26, 2019

Thank you!

@yarikoptic yarikoptic merged commit 23b4441 into datalad:0.11.x Jun 26, 2019
3 checks passed
@kyleam kyleam deleted the webui-subrepo-nocommits branch Jun 26, 2019
@kyleam
Copy link
Contributor Author

@kyleam kyleam commented Jun 26, 2019

Thank you!

Sure thing. Given I'm the cause of the upstream change, I suppose this and the related PRs are all problems of my own making :x

@yarikoptic yarikoptic added this to the Release 0.11.6 milestone Jul 26, 2019
yarikoptic added a commit that referenced this issue Jul 31, 2019
0.11.6 (Jul 30, 2019) -- am I the last of 0.11.x?

Primarily bug fixes to achieve more robust performance

Fixes

- Our tests needed various adjustments to keep up with upstream
  changes in Travis and Git. ([#3479][]) ([#3492][]) ([#3493][])

- `AnnexRepo.is_special_annex_remote` was too selective in what it
  considered to be a special remote.  ([#3499][])

- We now provide information about unexpected output when git-annex is
  called with `--json`.  ([#3516][])

- Exception logging in the `__del__` method of `GitRepo` and
  `AnnexRepo` no longer fails if the names it needs are no longer
  bound.  ([#3527][])

- [addurls][] botched the construction of subdataset paths that were
  more than two levels deep and failed to create datasets in a
  reliable, breadth-first order.  ([#3561][])

- Cloning a `type=git` special remote showed a spurious warning about
  the remote not being enabled.  ([#3547][])

Enhancements and new features

- For calls to git and git-annex, we disable automatic garbage
  collection due to past issues with GitPython's state becoming stale,
  but doing so results in a larger .git/objects/ directory that isn't
  cleaned up until garbage collection is triggered outside of DataLad.
  Tests with the latest GitPython didn't reveal any state issues, so
  we've re-enabled automatic garbage collection.  ([#3458][])

- [rerun][] learned an `--explicit` flag, which it relays to its calls
  to [run][[]].  This makes it possible to call `rerun` in a dirty
  working tree ([#3498][]).

- The [metadata][] command aborts earlier if a metadata extractor is
  unavailable.  ([#3525][])

* tag '0.11.6': (56 commits)
  [DATALAD RUNCMD] make update-changelog
  finalize CHANGELOG.md entry and boost version
  BF(DOC): close [create] with [] to not cause WARNING by md-strict pandoc
  CHANGELOG.md: Link entry from b3e8adb
  CHANGELOG.md: Add entry for gh-3547
  CHANGELOG.md: Add entry for gh-3561
  CHANGELOG.md: Add link for addurls
  RF: inform about special remotes based on autoenable config
  CHANGELOG.md: Second batch for 0.11.6
  BF: addurls: Process datasets in a stable, breadth-first order
  BF: addurls: Fix construction of nested subpaths
  TST: addurls: Don't hard-code path separator
  BF(TST): skip test_v7_detached_get in direct mode - fails to annex upgrade
  TST: benchmark-travis-pr: Swap 'pip install' and 'git show'
  TST: benchmark-travis-pr: Move repeated logic to run_asv()
  TST: benchmark-travis-pr: Support other bases
  TST: benchmark-travis-pr: Tweak message about current HEAD
  TST: benchmark-travis-pr: Simplify two git commands into one
  TST: benchmark-travis-pr: Reorder and break up lines
  TST: benchmark-travis-pr: Move command for running asv into function
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants