1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
## git2r, R bindings to the libgit2 library.
## Copyright (C) 2013-2021 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()
## Create directory for repository in tempdir
path <- tempfile(pattern = "git2r-")
dir.create(path)
## Create repository
repo <- init(path, branch = "main")
config(repo, user.name = "Alice", user.email = "alice@example.org")
## Add changes to repo
writeLines("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do",
con = file.path(path, "test-1.txt"))
add(repo, "test-1.txt")
commit_1 <- commit(repo, "First commit message")
## Create branch and checkout
checkout(branch_create(commit_1, name = "test"))
## Add changes to test branch
writeLines(c("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do",
"eiusmod tempor incididunt ut labore et dolore magna aliqua."),
con = file.path(path, "test-1.txt"))
add(repo, "test-1.txt")
commit_2 <- commit(repo, "Second commit message")
# Checkout main and merge
b <- branches(repo)
checkout(b[sapply(b, "[", "name") == "main"][[1]], force = TRUE)
m <- merge(b[sapply(b, "[", "name") == "test"][[1]])
# Check merge
stopifnot(inherits(m, "git_merge_result"))
stopifnot(identical(m$up_to_date, FALSE))
stopifnot(identical(m$fast_forward, TRUE))
stopifnot(identical(m$conflicts, FALSE))
stopifnot(identical(sha(m), NA_character_))
stopifnot(identical(length(commits(repo)), 2L))
# Check reflog
r <- reflog(repo)
stopifnot(identical(r[[1]]$message, "merge test: Fast-forward"))
## Cleanup
unlink(path, recursive = TRUE)
|
