Simplify a little bit

Author: jeroen

R/commit.R

@@ -244,7 +244,7 @@ git_stat_files <- function(files, ref = "HEAD", max = NULL, repo = '.') {
 #' Applies the inverse of the changes introduced by a given commit, equivalent
 #' to `git revert <commit>`. The commit must be reachable from the current HEAD.
 #'
-#' By default, a new revert commit is created immediately. Set `no_commit = TRUE`
+#' By default, a new revert commit is created immediately. Set `commit = FALSE`
 #' to only stage the reverted changes without committing, leaving you free to
 #' amend or combine them before calling [git_commit()].
 #'
@@ -253,11 +253,11 @@ git_stat_files <- function(files, ref = "HEAD", max = NULL, repo = '.') {
 #' @rdname git_revert
 #' @family git
 #' @inheritParams git_open
-#' @inheritParams git_commit
 #' @inheritParams git_commit_info
-#' @param no_commit if `TRUE`, stage the reverted changes without creating a
-#'   commit. Default is `FALSE`, that is to say, by default a commit is made.
+#' @param commit if `FALSE`, stage the reverted changes without creating a
+#'   commit. Default is `TRUE`, that is to say, by default a commit is made.
 #' @param message a commit message. Similar default to `git revert`.
+#' @param ... other parameters passed to `git_commit`
 #' @return The SHA of the new revert commit (invisibly), or `NULL` when
 #'   `no_commit = TRUE`.
 #' @examplesIf interactive()
@@ -300,23 +300,21 @@ git_stat_files <- function(files, ref = "HEAD", max = NULL, repo = '.') {
 #' @useDynLib gert R_git_revert
 git_revert <- function(
   ref,
+  commit = TRUE,
   message = NULL,
-  author = NULL,
-  committer = NULL,
-  no_commit = FALSE,
+  ...,
   repo = '.'
 ) {
   repo <- git_open(repo)
   assert_string(ref)
-  stopifnot(is.logical(no_commit), length(no_commit) == 1)
+  stopifnot(is.logical(commit), length(commit) == 1)
 
-  sha <- try(git_commit_id(ref, repo = repo), silent = TRUE)
-  if (inherits(sha, "try-error")) {
+  sha <- tryCatch(git_commit_id(ref, repo = repo), error = function(e){
     stop(sprintf(
       "Can't find reference/commit '%s' in the current branch history",
       ref
     ))
-  }
+  })
 
   head_sha <- git_commit_id("HEAD", repo = repo)
   sha_descends_from_head <- git_commit_descendant_of(
@@ -330,20 +328,12 @@ git_revert <- function(
 
   .Call(R_git_revert, repo, sha)
 
-  if (no_commit) {
-    return(NULL)
-  }
-
-  if (is.null(message)) {
-    message <- revert_message(sha, repo)
+  if (isTRUE(commit)) {
+    if (is.null(message)) {
+      message <- revert_message(sha, repo)
+    }
+    git_commit(message, ..., repo = repo)
   }
-
-  invisible(git_commit(
-    message,
-    author = author,
-    committer = committer,
-    repo = repo
-  ))
 }
 
 assert_string <- function(x) {

man/git_revert.Rd

@@ -222,7 +222,7 @@ test_that("reverting a commit", {
   writeLines("again", file.path(repo, "hello.txt"))
   git_add("hello.txt", repo = repo)
   third <- git_commit("Third commit", repo = repo)
-  result <- git_revert(third, no_commit = TRUE, repo = repo)
+  result <- git_revert(third, commit = FALSE, repo = repo)
   expect_null(result)
   status <- git_status(repo = repo)
   expect_true(any(status$staged))