Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Sources/GitKit/Git.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ public final class Git: Shell {
case writeConfig(name: String, value: String)
case readConfig(name: String)
case clone(url: String)
case checkout(branch: String, create: Bool = false)

/// - parameter branch the name of the branch to checkout
/// - parameter create whether to create a new branch or checkout an existing one
/// - parameter tracking when creating a new branch, the name of the remote branch it should track
case checkout(branch: String, create: Bool = false, tracking: String? = nil)

case log(numberOfCommits: Int? = nil, options: [String]? = nil, revisions: String? = nil)
case push(remote: String? = nil, branch: String? = nil)
case pull(remote: String? = nil, branch: String? = nil, rebase: Bool = false)
Expand Down Expand Up @@ -69,12 +74,15 @@ public final class Git: Shell {
}
case .clone(let url):
params = [Command.clone.rawValue, url]
case .checkout(let branch, let create):
case .checkout(let branch, let create, let tracking):
params = [Command.checkout.rawValue]
if create {
params.append("-b")
}
params.append(branch)
if let tracking {
params.append(tracking)
}
case .log(let numberOfCommits, let options, let revisions):
params = [Command.log.rawValue]
if let numberOfCommits = numberOfCommits {
Expand Down Expand Up @@ -149,7 +157,7 @@ public final class Git: Shell {
params = [Command.config.rawValue, "--add", name, value]
case .readConfig(let name):
params = [Command.config.rawValue, "--get", name]
case .revList(let branch, let count, let revisions):
case .revList(_, let count, let revisions):
params = [Command.revList.rawValue]
if count {
params.append("--count")
Expand Down
20 changes: 19 additions & 1 deletion Tests/GitKitTests/GitKitTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ final class GitKitTests: XCTestCase {
("testLog", testLog),
("testCommandWithArgs", testCommandWithArgs),
("testClone", testClone),
("testCheckoutRemoteTracking", testCheckoutRemoteTracking),
("testRevParse", testRevParse),
]

Expand Down Expand Up @@ -105,9 +106,26 @@ final class GitKitTests: XCTestCase {
self.assert(type: "output", result: statusOutput, expected: expectation)
}

func testRevParse() throws {
func testCheckoutRemoteTracking() throws {
let path = self.currentPath()
try self.clean(path: path)
let git = Git(path: path)

try git.run(.clone(url: "https://github.com/binarybirds/shell-kit.git"))

let repoPath = "\(path)/shell-kit"
let repoGit = Git(path: repoPath)

try repoGit.run(.checkout(branch: "feature-branch", create: true, tracking: "origin/main"))
let branchOutput = try repoGit.run(.raw("branch -vv"))
try self.clean(path: path)

XCTAssertTrue(branchOutput.contains("feature-branch"), "New branch should be created")
XCTAssertTrue(branchOutput.contains("origin/main"), "Branch should track origin/main")
}

func testRevParse() throws {
let path = self.currentPath()
try self.clean(path: path)
let git = Git(path: path)

Expand Down