Merge branch 'master' of github.com:laullon/gitx

laullon · laullon · commit 945a861abe94 · 2010-12-07T22:27:04.000-08:00
diff --git a/PBGitSHA.m b/PBGitSHA.m
@@ -82,7 +82,7 @@ - (id)initWithOID:(git_oid)g_oid
 - (NSString *)string
 {
 	if (!string) {
-		char *hex = git_oid_mkhex(&oid);
+		char *hex = git_oid_allocfmt(&oid);
 		if (hex == NULL)
 			return nil;
 		string = [NSString stringWithUTF8String:hex];
diff --git a/libgit2 b/libgit2
@@ -1 +1 @@
-Subproject commit bda29d0f7bc59a821b03c716562aef6ea3b5903a
+Subproject commit 998a7bf824c5faca0f9766c9b89bb73ec1315272

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ - (id)initWithOID:(git_oid)g_oid`
`82`	`82`	`- (NSString *)string`
`83`	`83`	`{`
`84`	`84`	`if (!string) {`
`85`		`- char *hex = git_oid_mkhex(&oid);`
	`85`	`+ char *hex = git_oid_allocfmt(&oid);`
`86`	`86`	`if (hex == NULL)`
`87`	`87`	`return nil;`
`88`	`88`	`string = [NSString stringWithUTF8String:hex];`