R Under development (unstable) (2023-11-25 r85635 ucrt) -- "Unsuffered Consequences" Copyright (C) 2023 The R Foundation for Statistical Computing Platform: x86_64-w64-mingw32/x64 R is free software and comes with ABSOLUTELY NO WARRANTY. You are welcome to redistribute it under certain conditions. Type 'license()' or 'licence()' for distribution details. R is a collaborative project with many contributors. Type 'contributors()' for more information and 'citation()' on how to cite R or R packages in publications. Type 'demo()' for some demos, 'help()' for on-line help, or 'help.start()' for an HTML browser interface to help. Type 'q()' to quit R. > ## git2r, R bindings to the libgit2 library. > ## Copyright (C) 2013-2023 The git2r contributors > ## > ## This program is free software; you can redistribute it and/or modify > ## it under the terms of the GNU General Public License, version 2, > ## as published by the Free Software Foundation. > ## > ## git2r is distributed in the hope that it will be useful, > ## but WITHOUT ANY WARRANTY; without even the implied warranty of > ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > ## GNU General Public License for more details. > ## > ## You should have received a copy of the GNU General Public License along > ## with this program; if not, write to the Free Software Foundation, Inc., > ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > library(git2r) > > ## For debugging > sessionInfo() R Under development (unstable) (2023-11-25 r85635 ucrt) Platform: x86_64-w64-mingw32/x64 Running under: Windows Server 2022 x64 (build 20348) Matrix products: default locale: [1] LC_COLLATE=C LC_CTYPE=German_Germany.utf8 [3] LC_MONETARY=C LC_NUMERIC=C [5] LC_TIME=C time zone: Europe/Berlin tzcode source: internal attached base packages: [1] stats graphics grDevices utils datasets methods base other attached packages: [1] git2r_0.33.0 loaded via a namespace (and not attached): [1] compiler_4.4.0 > libgit2_version() $major [1] 1 $minor [1] 7 $rev [1] 1 > libgit2_features() $threads [1] TRUE $https [1] TRUE $ssh [1] FALSE > > > ## Initialize a temporary repository > path <- tempfile(pattern = "git2r-") > dir.create(path) > repo <- init(path, branch = "main") > > ## Create a user and commit a file > config(repo, user.name = "Author", user.email = "author@example.org") > writeLines(c("First line in file 1.", "Second line in file 1."), + file.path(path, "example-1.txt")) > add(repo, "example-1.txt") > commit(repo, "First commit message") [788f34f] 2023-11-26: First commit message > > ## Create and add one more file > writeLines(c("First line in file 2.", "Second line in file 2."), + file.path(path, "example-2.txt")) > add(repo, "example-2.txt") > commit(repo, "Second commit message") [7895f7d] 2023-11-26: Second commit message > > ## Create a new branch 'fix' > checkout(repo, "fix", create = TRUE) > > ## Update 'example-1.txt' (swap words in first line) and commit > writeLines(c("line First in file 1.", "Second line in file 1."), + file.path(path, "example-1.txt")) > add(repo, "example-1.txt") > commit(repo, "Third commit message") [949db41] 2023-11-26: Third commit message > > checkout(repo, "main") > > ## Update 'example-2.txt' (swap words in second line) and commit > writeLines(c("First line in file 2.", "line Second in file 2."), + file.path(path, "example-2.txt")) > add(repo, "example-2.txt") > commit(repo, "Fourth commit message") [90beafb] 2023-11-26: Fourth commit message > > # Missing branch to merge with should throw an error > tools::assertError(merge(repo)) > > ## Merge 'fix' > m <- merge(repo, "fix", TRUE, default_signature(repo)) > stopifnot(identical(format(m), "Merge")) > > ## Merge 'fix' again > m <- merge(repo, "fix", TRUE, default_signature(repo)) > stopifnot(identical(format(m), "Already up-to-date")) > > ## Check number of parents of each commit > stopifnot(identical(sapply(commits(repo), function(x) length(parents(x))), + c(2L, 1L, 1L, 1L, 0L))) > > ## Check that last commit is a merge > stopifnot(is_merge(last_commit(repo))) > summary(last_commit(repo)) Commit: f89c975d95951fd67bbb7ee4fb8b873aa1326161 Merge: 90beafb0259cf9876d7f44e037fee9f25ba8335e 949db414c630b0739e9c294332b8eb5501c2a110 Author: Author When: 2023-11-26 16:36:22 GMT merge fix Commit message: 90beafb0259cf9876d7f44e037fee9f25ba8335e Fourth commit message Commit message: 949db414c630b0739e9c294332b8eb5501c2a110 Third commit message > > ## Check that metadata associated with merge is removed > stopifnot(!file.exists(file.path(path, ".git", "MERGE_HEAD"))) > > ## Cleanup > unlink(path, recursive = TRUE) > > proc.time() user system elapsed 0.25 0.06 0.29