rugged 0.24.0b5 → 0.24.0b6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/src/merge.c +2 -2
- data/vendor/libgit2/src/pool.h +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 57c683acff03189ef9196296e95aa485bc55529d
|
|
4
|
+
data.tar.gz: 55277e7b32012102b7f3bff2983dbeb0a88b085f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0747d31d7351cf1831446d043bcf1c68cab7f9bb4080b2acb1eae02a5360aa4ad4e66cb637da1e65622d02eb056e2cfe54b6dff0935e42680d55a108bff3aa9d
|
|
7
|
+
data.tar.gz: ae77e90ec575f52368f60d7e9ae3ecf353b32e1f1d57d35a08ec967d2695d892c56de11b687e5bc3768b8e63e7320baa7986af2fee1564a800ca57e8b8bec0b9
|
data/lib/rugged/version.rb
CHANGED
data/vendor/libgit2/src/merge.c
CHANGED
|
@@ -626,7 +626,7 @@ static int merge_conflict_resolve_one_renamed(
|
|
|
626
626
|
git_oid__cmp(&conflict->our_entry.id, &conflict->their_entry.id) != 0)
|
|
627
627
|
return 0;
|
|
628
628
|
|
|
629
|
-
if ((merged =
|
|
629
|
+
if ((merged = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry))) == NULL)
|
|
630
630
|
return -1;
|
|
631
631
|
|
|
632
632
|
if (ours_changed)
|
|
@@ -1383,7 +1383,7 @@ static int merge_diff_list_insert_unmodified(
|
|
|
1383
1383
|
int error = 0;
|
|
1384
1384
|
git_index_entry *entry;
|
|
1385
1385
|
|
|
1386
|
-
entry =
|
|
1386
|
+
entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry));
|
|
1387
1387
|
GITERR_CHECK_ALLOC(entry);
|
|
1388
1388
|
|
|
1389
1389
|
if ((error = index_entry_dup_pool(entry, &diff_list->pool, tree_items[0])) >= 0)
|
data/vendor/libgit2/src/pool.h
CHANGED
|
@@ -28,7 +28,7 @@ typedef struct git_pool_page git_pool_page;
|
|
|
28
28
|
* For examples of how to set up a `git_pool` see `git_pool_init`.
|
|
29
29
|
*/
|
|
30
30
|
typedef struct {
|
|
31
|
-
git_pool_page *pages; /* pages
|
|
31
|
+
git_pool_page *pages; /* allocated pages */
|
|
32
32
|
uint32_t item_size; /* size of single alloc unit in bytes */
|
|
33
33
|
uint32_t page_size; /* size of page in bytes */
|
|
34
34
|
} git_pool;
|