Fixes #100

pharo-vcs · Oct 13, 2016 · 290064a · 290064a
1 parent 13cfbaf
commit 290064a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/Iceberg-Tests.package/IceRepositoryTest.class/instance/testCloneOntoExistingDirectory.st b/Iceberg-Tests.package/IceRepositoryTest.class/instance/testCloneOntoExistingDirectory.st
@@ -0,0 +1,10 @@
+tests - create repository
+testCloneOntoExistingDirectory
+	| location |
+
+	location := repository location.
+	location ensureCreateDirectory.
+
+	repository createRepository.
+	self assert: (location / '.git') exists.
+
diff --git a/Iceberg.package/IceMCGitRepository.class/instance/validate.st b/Iceberg.package/IceMCGitRepository.class/instance/validate.st
@@ -1,6 +1,5 @@
 initialize local repository
 validate
 	"TODO: More validations are needed, see: https://github.com/npasserini/iceberg/issues/27."
-	(self isGitRepository: directory)
-		ifFalse: [ MCFileTreeGitError new
-				signal: 'is not a git repository: ' , directory ].
+	(((self repositoryDirectory / '.git') exists) and: [self isGitRepository: self repositoryDirectory ])
+		ifFalse: [ MCFileTreeGitError new signal: 'is not a git repository: ' , directory ].
diff --git a/Iceberg.package/IceRepository.class/instance/repository..st b/Iceberg.package/IceRepository.class/instance/repository..st
@@ -2,14 +2,15 @@ repository handling
 repository: anMCRepository
 	repository := anMCRepository.
 
-	self location exists
+	(self location exists not or: [ self location hasChildren not ])
 		ifTrue: [ 
+			repository cloneRepository. 
+			repository validate
+		]
+		ifFalse: [ 
 			repository validate. 
 			branch 
 				ifNil: [ self branchName: repository currentBranch. ]
-				ifNotNil: [ self checkoutBranch: branch name ]]
-		ifFalse: [ 
-			repository cloneRepository. 
-			repository validate
+				ifNotNil: [ self checkoutBranch: branch name ]
 		]