Cleanup exports

stewid · stewid · commit 03a58a443cdc · 2024-10-19T15:37:56.000+02:00
diff --git a/NAMESPACE b/NAMESPACE
@@ -65,7 +65,6 @@ S3method(summary,git_tag)
 S3method(summary,git_tree)
 export(add)
 export(ahead_behind)
-export(as.data.frame)
 export(blame)
 export(blob_create)
 export(branch_create)
@@ -91,7 +90,6 @@ export(cred_token)
 export(cred_user_pass)
 export(default_signature)
 export(descendant_of)
-export(diff)
 export(discover_repository)
 export(fetch)
 export(fetch_heads)
@@ -121,7 +119,6 @@ export(libgit2_version)
 export(lookup)
 export(lookup_commit)
 export(ls_tree)
-export(merge)
 export(merge_base)
 export(note_create)
 export(note_default_ref)
diff --git a/R/diff.R b/R/diff.R
@@ -300,6 +300,3 @@ diff.git_tree <- function(x,
           as.integer(context_lines), as.integer(interhunk_lines),
           old_prefix, new_prefix, id_abbrev, path, max_size)
 }
-
-##' @export
-base::diff
diff --git a/R/merge.R b/R/merge.R
@@ -104,9 +104,6 @@ merge.character <- function(x = ".", y = NULL, commit_on_success = TRUE,
     merge.git_repository(x, y, commit_on_success, merger, fail)
 }
 
-##' @export
-base::merge
-
 ##' @export
 format.git_merge_result <- function(x, ...) {
     if (isTRUE(x$up_to_date))
diff --git a/R/tree.R b/R/tree.R
@@ -76,9 +76,6 @@ as.data.frame.git_tree <- function(x, ...) {
                stringsAsFactors = FALSE)
 }
 
-##' @export
-base::as.data.frame
-
 ##' Coerce entries in a git_tree to a list of entry objects
 ##'
 ##' @param x The tree \code{object}
diff --git a/man/reexports.Rd b/man/reexports.Rd

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,3 @@ diff.git_tree <- function(x,`
`300`	`300`	`as.integer(context_lines), as.integer(interhunk_lines),`
`301`	`301`	`old_prefix, new_prefix, id_abbrev, path, max_size)`
`302`	`302`	`}`
`303`		`-`
`304`		`-##' @export`
`305`		`-base::diff`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,6 @@ merge.character <- function(x = ".", y = NULL, commit_on_success = TRUE,`
`104`	`104`	`merge.git_repository(x, y, commit_on_success, merger, fail)`
`105`	`105`	`}`
`106`	`106`
`107`		`-##' @export`
`108`		`-base::merge`
`109`		`-`
`110`	`107`	`##' @export`
`111`	`108`	`format.git_merge_result <- function(x, ...) {`
`112`	`109`	`if (isTRUE(x$up_to_date))`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,6 @@ as.data.frame.git_tree <- function(x, ...) {`
`76`	`76`	`stringsAsFactors = FALSE)`
`77`	`77`	`}`
`78`	`78`
`79`		`-##' @export`
`80`		`-base::as.data.frame`
`81`		`-`
`82`	`79`	`##' Coerce entries in a git_tree to a list of entry objects`
`83`	`80`	`##'`
`84`	`81`	`##' @param x The tree \code{object}`