Merge pull request Carthage#2260 from Carthage/revert-2125-fix-fetchi…

…ng-relative-path-repository Revert "Fix fetching a local repository with relative path"
abrindam · Nov 14, 2017 · 8915f54 · 8915f54
2 parents f3d43f3 + 31f0d72
commit 8915f54
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/Source/CarthageKit/Git.swift b/Source/CarthageKit/Git.swift
@@ -16,13 +16,13 @@ public struct FetchCache {
 	/// Amount of time before a git repository is fetched again. Defaults to 1 minute
 	public static var fetchCacheInterval: TimeInterval = 60.0
 
-	private static var lastFetchTimes: [URL : TimeInterval] = [:]
+	private static var lastFetchTimes: [GitURL : TimeInterval] = [:]
 
 	internal static func clearFetchTimes() {
 		lastFetchTimes.removeAll()
 	}
 
-	internal static func needsFetch(forURL url: URL) -> Bool {
+	internal static func needsFetch(forURL url: GitURL) -> Bool {
 		guard let lastFetch = lastFetchTimes[url] else {
 			return true
 		}
@@ -32,8 +32,10 @@ public struct FetchCache {
 		return !(0...fetchCacheInterval).contains(difference)
 	}
 
-	fileprivate static func updateLastFetchTime(forURL url: URL) {
-		lastFetchTimes[url] = Date().timeIntervalSince1970
+	fileprivate static func updateLastFetchTime(forURL url: GitURL?) {
+		if let url = url {
+			lastFetchTimes[url] = Date().timeIntervalSince1970
+		}
 	}
 }
 
@@ -88,21 +90,18 @@ public func cloneRepository(_ cloneURL: GitURL, _ destinationURL: URL, isBare: B
 
 	return launchGitTask(arguments + [ "--quiet", cloneURL.urlString, destinationURL.path ])
 		.on(completed: {
-			FetchCache.updateLastFetchTime(forURL: destinationURL)
+			FetchCache.updateLastFetchTime(forURL: cloneURL)
 		})
 }
 
 /// Returns a signal that completes when the fetch completes successfully.
-public func fetchRepository(_ repositoryFileURL: URL, refspec: String? = nil) -> SignalProducer<String, CarthageError> {
+public func fetchRepository(_ repositoryFileURL: URL, remoteURL: GitURL? = nil, refspec: String? = nil) -> SignalProducer<String, CarthageError> {
 	precondition(repositoryFileURL.isFileURL)
 
 	var arguments = [ "fetch", "--prune", "--quiet" ]
-
-	// Use the `origin` remote which should have been set up.
-	//
-	// See https://github.com/Carthage/Carthage/issues/968
-	// and https://github.com/Carthage/Carthage/pull/2125.
-	arguments.append("origin")
+	if let remoteURL = remoteURL {
+		arguments.append(remoteURL.urlString)
+	}
 
 	// Specify an explict refspec that fetches tags for pruning.
 	// See https://github.com/Carthage/Carthage/issues/1027 and `man git-fetch`.
@@ -114,7 +113,7 @@ public func fetchRepository(_ repositoryFileURL: URL, refspec: String? = nil) ->
 
 	return launchGitTask(arguments, repositoryFileURL: repositoryFileURL)
 		.on(completed: {
-			FetchCache.updateLastFetchTime(forURL: repositoryFileURL)
+			FetchCache.updateLastFetchTime(forURL: remoteURL)
 		})
 }
 
@@ -488,7 +487,7 @@ public func addSubmoduleToRepository(_ repositoryFileURL: URL, _ submodule: Subm
 		.flatMap(.merge) { submoduleExists -> SignalProducer<(), CarthageError> in
 			if submoduleExists {
 				// Just check out and stage the correct revision.
-				return fetchRepository(submoduleDirectoryURL, refspec: "+refs/heads/*:refs/remotes/origin/*")
+				return fetchRepository(submoduleDirectoryURL, remoteURL: fetchURL, refspec: "+refs/heads/*:refs/remotes/origin/*")
 					.then(
 						launchGitTask(
 							["config", "--file", ".gitmodules", "submodule.\(submodule.name).url", submodule.url.urlString],

diff --git a/Source/CarthageKit/Project.swift b/Source/CarthageKit/Project.swift
@@ -1225,13 +1225,13 @@ public func cloneOrFetch(
 				.flatMap(.merge) { isRepository -> SignalProducer<(ProjectEvent?, URL), CarthageError> in
 					if isRepository {
 						let fetchProducer: () -> SignalProducer<(ProjectEvent?, URL), CarthageError> = {
-							guard FetchCache.needsFetch(forURL: repositoryURL) else {
+							guard FetchCache.needsFetch(forURL: remoteURL) else {
 								return SignalProducer(value: (nil, repositoryURL))
 							}
 
 							return SignalProducer(value: (.fetching(dependency), repositoryURL))
 								.concat(
-									fetchRepository(repositoryURL, refspec: "+refs/heads/*:refs/heads/*")
+									fetchRepository(repositoryURL, remoteURL: remoteURL, refspec: "+refs/heads/*:refs/heads/*")
 										.then(SignalProducer<(ProjectEvent?, URL), CarthageError>.empty)
 								)
 						}