Fix "fatal: destination path … already exists" on checkout #861
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`git rev-parse --git-dir` returns not only relative path but also absolute path. When absolute path was returned, it caused "fatal: destination path" error.
norio-nomura
changed the title
|
Good catch! Using a relative path makes me a little uneasy. Could we use |
|
Oh, this PR still have a bug. |
|
Thanks for reviewing. |
| if (relativeOrAbsoluteGitDirectory as NSString).absolutePath { | ||
| absoluteGitDirectory = relativeOrAbsoluteGitDirectory | ||
| } else { | ||
| absoluteGitDirectory = (directoryURL.path! as NSString).stringByAppendingPathComponent(relativeOrAbsoluteGitDirectory) |
There was a problem hiding this comment.
directoryURL.URLByAppendingPathComponent would be better.
There was a problem hiding this comment.
Would it be as follows?:
absoluteGitDirectory = directoryURL.URLByAppendingPathComponent(relativeOrAbsoluteGitDirectory).path!
There was a problem hiding this comment.
It would be better as follows:
var absoluteGitDirectory: String?
if (relativeOrAbsoluteGitDirectory as NSString).absolutePath {
absoluteGitDirectory = relativeOrAbsoluteGitDirectory
} else {
absoluteGitDirectory = directoryURL.URLByAppendingPathComponent(relativeOrAbsoluteGitDirectory).path
}
var isDirectory: ObjCBool = false
let directoryExists = absoluteGitDirectory.map { NSFileManager.defaultManager().fileExistsAtPath($0, isDirectory: &isDirectory) } ?? false
|
That looks great! Thanks! |
mdiep
added a commit
that referenced
this pull request
Oct 24, 2015
…y-exists-on-checkout Fix "fatal: destination path … already exists" on checkout
norio-nomura
deleted the
fix-destination-path-already-exists-on-checkout
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git rev-parse --git-dirreturns not only relative path but also absolute path. When absolute path was returned, it caused "fatal: destination path" error.% git rev-parse --git-dir .git % cd Carthage/Checkouts/Argo % git rev-parse --git-dir /Users/norio/Documents/workspace/github/Carthage/.git/modules/Carthage/Checkouts/Argo %