From 49c9737145bb7ad4f5e7101317b793658c8f88b9 Mon Sep 17 00:00:00 2001
From: Stefan Widgren <stefan.widgren@gmail.com>
Date: Sat, 19 Oct 2024 16:05:31 +0200
Subject: [PATCH] Revert "Cleanup exports"

This reverts commit 03a58a443cdc98f1cc784bdfe0dfc87768bf3d8f.
---
 NAMESPACE        | 3 +++
 R/diff.R         | 3 +++
 R/merge.R        | 3 +++
 R/tree.R         | 3 +++
 man/reexports.Rd | 7 ++++++-
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/NAMESPACE b/NAMESPACE
index f14bf4732..fa22d9087 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -65,6 +65,7 @@ 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)
@@ -90,6 +91,7 @@ export(cred_token)
 export(cred_user_pass)
 export(default_signature)
 export(descendant_of)
+export(diff)
 export(discover_repository)
 export(fetch)
 export(fetch_heads)
@@ -119,6 +121,7 @@ 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
index 0751ff119..91e13201a 100644
--- a/R/diff.R
+++ b/R/diff.R
@@ -300,3 +300,6 @@ 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
index 4792c51fc..51029ec38 100644
--- a/R/merge.R
+++ b/R/merge.R
@@ -104,6 +104,9 @@ 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
index 117af02be..0077c7db6 100644
--- a/R/tree.R
+++ b/R/tree.R
@@ -76,6 +76,9 @@ 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
index 4ad969763..eca17ab6f 100644
--- a/man/reexports.Rd
+++ b/man/reexports.Rd
@@ -1,9 +1,12 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/repository.R
+% Please edit documentation in R/diff.R, R/merge.R, R/repository.R, R/tree.R
 \docType{import}
 \name{reexports}
 \alias{reexports}
+\alias{diff}
+\alias{merge}
 \alias{head}
+\alias{as.data.frame}
 \title{Objects exported from other packages}
 \keyword{internal}
 \description{
@@ -11,6 +14,8 @@ These objects are imported from other packages. Follow the links
 below to see their documentation.
 
 \describe{
+  \item{base}{\code{\link[base]{as.data.frame}}, \code{\link[base]{diff}}, \code{\link[base]{merge}}}
+
   \item{utils}{\code{\link[utils]{head}}}
 }}