rugged 0.24.0b5 → 0.24.0b6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc796cda2006fded0d97c4defe401f810e34f19f
-  data.tar.gz: f0d1d335923bb6ca15116e10404046fb9a18a339
+  metadata.gz: 57c683acff03189ef9196296e95aa485bc55529d
+  data.tar.gz: 55277e7b32012102b7f3bff2983dbeb0a88b085f
 SHA512:
-  metadata.gz: 30f6c194e1863b2a946d7b5ed52b5fa911717e1fc0dd5d55f1d4d992dacfc0af567715a2abe86a3c366bda619d0377fed896ac48e2da5c73b8e07486a179a831
-  data.tar.gz: 4b636574374df656c945b44a2e03d23c401fae824bb3f9b0e07da1418853268ee188e3e4e53756d8bfce80dedf9dc475397d5ecc8a9fc4a82dcb5fddad570c62
+  metadata.gz: 0747d31d7351cf1831446d043bcf1c68cab7f9bb4080b2acb1eae02a5360aa4ad4e66cb637da1e65622d02eb056e2cfe54b6dff0935e42680d55a108bff3aa9d
+  data.tar.gz: ae77e90ec575f52368f60d7e9ae3ecf353b32e1f1d57d35a08ec967d2695d892c56de11b687e5bc3768b8e63e7320baa7986af2fee1564a800ca57e8b8bec0b9

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.24.0b5'
+  Version = VERSION = '0.24.0b6'
 end

data/vendor/libgit2/src/merge.c

@@ -626,7 +626,7 @@ static int merge_conflict_resolve_one_renamed(
 		git_oid__cmp(&conflict->our_entry.id, &conflict->their_entry.id) != 0)
 		return 0;
 
-	if ((merged = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry))) == NULL)
+	if ((merged = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry))) == NULL)
 		return -1;
 
 	if (ours_changed)
@@ -1383,7 +1383,7 @@ static int merge_diff_list_insert_unmodified(
 	int error = 0;
 	git_index_entry *entry;
 
-	entry = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry));
+	entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry));
 	GITERR_CHECK_ALLOC(entry);
 
 	if ((error = index_entry_dup_pool(entry, &diff_list->pool, tree_items[0])) >= 0)

data/vendor/libgit2/src/pool.h

@@ -28,7 +28,7 @@ typedef struct git_pool_page git_pool_page;
  * For examples of how to set up a `git_pool` see `git_pool_init`.
  */
 typedef struct {
-	git_pool_page *pages; /* pages with space left */
+	git_pool_page *pages; /* allocated pages */
 	uint32_t item_size;  /* size of single alloc unit in bytes */
 	uint32_t page_size;  /* size of page in bytes */
 } git_pool;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.24.0b5
+  version: 0.24.0b6
 platform: ruby
 authors:
 - Scott Chacon