Commit.create: now handles empty repositories correctly

Byron · Byron · commit 0bb2fc8129ed · 2010-02-13T20:02:01.000+01:00
diff --git a/lib/git/objects/commit.py b/lib/git/objects/commit.py
@@ -313,7 +313,13 @@ def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False):
 		"""
 		parents = parent_commits
 		if parent_commits is None:
-			parent_commits = [ repo.head.commit ]
+			try:
+				parent_commits = [ repo.head.commit ]
+			except ValueError:
+				# empty repositories have no head commit
+				parent_commits = list()
+			# END handle parent commits
+		# END if parent commits are unset
 		
 		parent_args = [ ("-p", str(commit)) for commit in parent_commits ]
 		
@@ -331,7 +337,14 @@ def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False):
 			new_commit = cls(repo, commit_sha)
 			
 			if head:
-				repo.head.commit = new_commit 
+				try:
+					repo.head.commit = new_commit
+				except ValueError:
+					# head is not yet set to master - create it and set it
+					import git.refs
+					master = git.refs.Head.create(repo, 'master', commit=new_commit)
+					repo.head.reference = master
+				# END handle empty repositories
 			# END advance head handling 
 			
 			return new_commit
