Skip to content

Commit

Permalink
Merge branch 'main' into more-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
olivroy authored Sep 19, 2024
2 parents 53a23cf + f0075d1 commit 36be270
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 29 deletions.
11 changes: 5 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
Type: Package
Package: gert
Title: Simple Git Client for R
Version: 2.1.1
Version: 2.1.2
Authors@R: c(
person("Jeroen", "Ooms", role = c("aut", "cre"), email = "[email protected]",
person("Jeroen", "Ooms", role = c("aut", "cre"), email = "[email protected]",
comment = c(ORCID = "0000-0002-4035-0289")),
person("Jennifer", "Bryan", role = "ctb", email = "jenny@rstudio.com",
person("Jennifer", "Bryan", role = "ctb", email = "jenny@posit.co",
comment = c(ORCID = "0000-0002-6983-2759")))
Description: Simple git client for R based on 'libgit2' <https://libgit2.org> with
support for SSH and HTTPS remotes. All functions in 'gert' use basic R data
types (such as vectors and data-frames) for their arguments and return values.
User credentials are shared with command line 'git' through the git-credential
store and ssh keys stored on disk or ssh-agent.
License: MIT + file LICENSE
URL: https://docs.ropensci.org/gert/,
https://ropensci.r-universe.dev/gert
URL: https://docs.ropensci.org/gert/, https://ropensci.r-universe.dev/gert
BugReports: https://github.com/r-lib/gert/issues
Imports:
askpass,
Expand All @@ -32,6 +31,6 @@ VignetteBuilder:
knitr
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
RoxygenNote: 7.3.2.9000
SystemRequirements: libgit2 (>= 1.0): libgit2-devel (rpm) or libgit2-dev (deb)
Language: en-US
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2.1.2
- Remove test verbosity per CRAN request
- Update maintainer email address

2.1.1
- No visible changes

Expand Down
4 changes: 3 additions & 1 deletion R/credentials.R
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,7 @@ remote_to_host <- function(repo, remote){
}

url_to_host <- function(url){
credentials:::parse_url(url, allow_ssh = TRUE)[['host']]
#credentials:::parse_url(url, allow_ssh = TRUE)[['host']]
parse_url <- utils::getFromNamespace('parse_url', 'credentials')
parse_url(url, allow_ssh = TRUE)[['host']]
}
4 changes: 2 additions & 2 deletions man/gert-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion tests/libgit2.R

This file was deleted.

19 changes: 0 additions & 19 deletions tests/libgit2.Rout.save

This file was deleted.

0 comments on commit 36be270

Please sign in to comment.