thodg/libgit2

diff --git a/tests-clay/clay b/tests-clay/clay
index 365027a..d042a2a 100755
--- a/tests-clay/clay
+++ b/tests-clay/clay
@@ -190,13 +190,13 @@ class ClayTestBuilder:
 
         print("  %s (%d tests)" % (clean_name, len(callbacks)))
 
+
 CLAY_FILES = {
-"clay.c" : r"""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""",
-"clay_sandbox.c" : r"""eJyNVe9v2jAQ/Zz8FVcqlaTQkm7Vpon1w7R2E1pbENC1UousNHGKtcRBsWGjFf/7znYgP6DdEBJR7nz33rt7RkhfsgCCqZ8BCWJ/SWa+nN6fep8+TLq2LUyYcWkzQRZ+zEIik5lOcoKUC2mOHqoXrv1iW6PxlzEZg5B42mIROKqEo8JtOBDShb0z8FzbsjIq5xkHb523NyK90XlviAeOhSRJGlK3npc/O34QUCHyqrek/8OFM1W2a68qmCPGy3g10sd5FNGsDYI9UyIhpvwph54fNLTy8MLPSJDOuYQzOO3WckxByheoTCbuJ5iDZazG+GqARBptUE/658L83owuhoNh/1vv8qJhg7VCTvssCmkE5LZ3/f6dUeI7lWOazAYKs3N+2x+euwZlGwz4mi77NBYUy+WQmVIqSjNwGALyusDgc8GjC60WczXOGglMfqISH5wNIzZBSS0zHnyp2qpTkvE5VV10ZHsxVKppgXplPJgtnbXqGGqvNVelSzQsa2Xj17Y6h9CLQE6pymZZyhOK+ocpFbyJg/GX4POlnDL+1AaZLUGmMBcUOtgfDjv2K6AaKt7IcdVhmWAFWQnYCiXmIYsMtvGUCRBLIWmyARWzXxRBVPAoAsE8yzR4ltFAphh8A+Dxq+iO34C2ccXRSXn9FykLQRt6zoXPw8f0j6Pe6U1XAEpu9ybKPs0Hr1ks1vZqBlNkgSgRZrcQJBIkS0rF6h7ElWVxSHIIhukGR2kDVYBIn8XaRg1dT0lzpz8NZb2NYddXRtXeBQZj7jQqw3LRBOV7R6llW1gMu6He+FAlUWf/Ajh6nmYJDu2Zarhq0IP+qHcH6LbffhaCiH0xpUIPuWRHa8uOikRhxPo8WD6PBz0Py6qFoNlpbuyyGUSthmJ2BCcTdd9ivmlUjbdaRTG1R+u1K7KgpZC2i+HsUhbbYFJZsqvRV/LzYphjSn6hU2ZE/HNAtX8GNSFztek6pkylMYp0fXN5uXUmV6SwSXUjdYX/9wQcHOxa4t0LZZAqo5TZeh89byc/c8A4q8xsZ2qFz1+bVFxx""",
+"clay.c" : r"""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""",
+"clay_sandbox.c" : r"""eJyNVV1P20AQfLZ/xRIkYpNATItaVSkPlaBVVEoiEgQSRJaxz+SEfY7uLmkD4r931+fEHwRahBST3Zudmb0xSgeahxDOAgl+mAQrfx7o2e2x9+XTtG/bypS50DZX/jJIeOTrdJ43OWEmlDZH9+kL1362rfHk28SfgNJ42uIxOAThULkLe0q7sHMCnmtblmR6IQV4676dsT8Ynw4u8cCh0n6aRcxt9hXPThCGTKkC9dof/nThhGD79kuNc8xFlW/O9H4Rx0x2QfEn5mtImHgw1Hd5LCIWg389uPj4wbYKHKOy6F4G0g+zhdBwAsf9Ro/BZ2KJRkl1O8UeNMRqTX6NUFerC/SUf5yZz6vx2eXocvh9cH7WssF6QYlgFZM46Y0zCQ5HHK8PHL6W4/vQ6XA3h2/MxuYHpvHB2RDhUzTGMibjl2QqndJcLBhNySuv10utZgTKlCKcr5y1d1jqrp0j6MqSLOvFxl/b6u3DIAY9Y9TNZSZShrZFGVOijX4GKwjESs+4eOiClivQGSwUgx7Oh/2e/QapFtVbBa8mLVOsMasQQ1K7LFHMQP9gesLS+YhAndPr4eWpa451wcA1Lt8uExGPja7JjCtQK6VZuhGU8EeGAmpaSHy4kDIXziULdYbFd8Qdvqns8D1Z6z8PjqoBWGY8gjzSC6ECEd1nfxz6Lo8pEajk3ZtSgNp3XrtUjVcDI1FNRDhDFcgSaVYMiZUv0wpYM4XoJ08iv6BglG54VG4vFXwd8CRPTivHI2tu8p8WpW0T2fVLox7wkoOJdxZXabkYoOqbh9yyLQTDaeg3PtRFNNU/A65eZDLFpT2xnC4tejQcD24Ak/o7kBGoJFAzpvIlV6JsvYoyiShD3NwHL/Zxl+/DsholaPfam6htFtHAIGUHcDSlNy72m0H1eqdTgtE9Wl+7sgs6xLRbLmebszgGm7ZYRozSR4zJ3Ff/3E7jH4NZj0Gga1c97n32vK0HKgHHUzS4xhM9vbg6P391qDCwTFX9AucI/x8h2Nvbdue33z9CMbmqEt3qRY3eX120XBI=""",
 "clay_fixtures.c" : r"""eJyFUV1LwzAUfW5+xZU9rLUVJ4ggZQ9DFAUfRCZMRglZmrBAl5Qkk03xv9v0a82U+Zabc+45595rLLGCAlXSWKBrouEccbGzW81wSew6HCIrYljicTuqJBsWoS8UmFbPobXA8npye5OlFSI+GbaglbK4YDJFKOjeMAVjdfUInUPkyFZLWu7DWiKBxtgpKN78RZETEByactlLXcBVBmdTGF+OIxQEPhrHGdRQ1zzMv5xUYN84ROLY8b1MEPeTJEdsV3tRq0wdt06tWcWVzXpS9I3QSPCccbh7nr3jh6fF/O31Hr/M5o9ouGpa4NYlPHmBVt074i/lBLy+OsWHEjkcXLAhMl+p3Wk3bjBV1VIG6TxOApgWZN8s4k8bWjAit+W/NnoTejMddI+GqW1GTOaCox8pOffr""",
 "clay_fs.c" : r"""eJylVdtu20YQfSa/YkAD8TKWY8dJX6L0wXDEVqgsBhINN7UFhiGX1qIkl9hd+dLG/57ZCynJUWEkfZE0s7NnZufMGe2xsqAlpJfj6ZsT399DgzUUojhKo8npb3Mg+ud8PBlNE/hq/NP4LJ5G49n5aTKOp71zNJvFs4vx06DzPz6MZ6HvS5UplkO+zAS89EtWUd7KtM3UkuS8kcqdGE/o/+t71tYm/ArTi8lk6HuS/UNTBRVtbtRyAGzo+x4rgaQ2zMaFvucJqlaicdd8z15AHKkE/rbxIQI6+DqrKp4TF3YAJ2GH/AxwTeu8fTBRA0jtl0Xp0K+sucAsx9suzPPauX2v5AIIMxYweO9AhnBwwELAbvTFXLGFrmf/aF+X4/Uu2L++3scEjwjmitRnQ/+x7/0tZ0XXecIaBTUv6AC22i/5SuRPnQWVynAy/z3CSYg/zpPZxVkCJQLp4m2YvYqVbJHrEHU7bJgG+y7IZNBQf1HBz2nNxQN5oeEHoDnnJdlOHYa2aa18dRetmlxziI8ZOl8bCV5ruk3u3ptw9OlUnaeMquxGorOfd/OcKs2kpEKlBFuMibHUuKUCm8gbW1aoOTge4HFwyZqC30l4EgdlhmYR+J4tVVBK1q0wpnv0U4JkKmqygxTDQEdfFKcfRpNRMsKx6zgzM7oLL+c4oz9A80aSs/jjp40U6bpmA46t0vgVzZpVS7TLApg3lOwe55A6ivMqe3AKCV4GoQXZo5WkXbk4kr5c0qpK+UoRW5SrMBM3t1cLg60HV19YSS0nVuA+wE/dY/zSg8XF32StX/S9h2OrobIVeLskUhVUCM2eF8wfpKI1oM3FO/hsb3+GHDeCo/DVdRNozjx6zxQ5fB06lXXwehIsPr2n+S0xtR4vBqboLvguYwqD9YUBvLD1D/DesFfr5ejPcTJPTpOLObHn/4PLnkprmpJ+WQy3pbpeqNZOcenovvVCxm1ZIK0bEl4Hrpdpf2pbYs2rjchDs+f6nfVfAXYRuu6hGRx9Yc1R3gZD5zVBweGsd5wsNjVuXG+0y81O6KRuDt4u+r8Ro/B6JRWOo5RG5OuxM6QZYUeGfVAcdM9B6b3lRlpqr8ya4gu/363wZ0W9oekNjt4udvVA1N/1oNxuQvfiHc342TdbTYNa0u2XPiN9I/NV464Qs/e1a8PxiLJvClb63wD3Q6FA""",
 "clay.h" : r"""eJy9Vctu2zAQPEdfsbV6sAQhTq9pGsAIbMSAERStg7YngqZWEVGZVEmqcVH030NSfkm2qqYHn0wtOTuzu0M65JlIMQNC7ubjb2Qx+bwg94QEoQ1ygUfxIOSCFVWKcKNNWvDlZX4bBD8lT4EV9BchVGtUZhhccGGASZFyw6VIggu71jaSUwVxxgtM6iOFZWntolJStWIpaqZ4ucnlgDqXVZESupTKRO93GohGQ1iBVFTl0MeG8eYzqr/jKIF6IUv6o0IL3mIz3YC6tCHPXH98F6azr4vHTxPycby4Dw7VOShfm0rhsFmmjxFBVw2WTVhTkS7l+jWQrbq/QEK0Pc+CYBTHAcQw9vOwbYMVZUpqeOYmB1yXBWfcgO81rFBr+oT2/Gg3ecu6qrQhpZ0oGVqASsBNIWoO2u9EcPsBrhLrlulsPiHEreazB78aTCvBvABGiwIyamefXsMAwn3OBN5FR8TuZD/xTSfvZF0iM5hC1hBgpNfQo6Am6ad/01235Ve2r46YaxDSgFEVnuLdzuouR/b9P+bEHO5Mg7qKjpnPPKlTEs4wqKuo51IJ+Y/XaSOpecPqYAIPj/P56cvQgtVd74Rtyt9hto5uArqt11fN3nR7jkMjdgrbe6YN7KnIH2pjOuqZSsWcoWxG+zaOnqkSXDy1a/AiTnimyykLtK9ufTEuB6cfjg3Ta7J+qSGQVsr9GEeCa2SVc9j14IT/vI4VmlymdtOSKOrOal/f29+4NqgEOdz5E2z/GF4ABeagMA=="""
 }
-
 if __name__ == '__main__':
     main()
diff --git a/tests-clay/clay.h b/tests-clay/clay.h
index e77a647..184635e 100644
--- a/tests-clay/clay.h
+++ b/tests-clay/clay.h
@@ -57,6 +57,17 @@ void cl_fixture_cleanup(const char *fixture_name);
 /**
  * Test method declarations
  */
+extern void test_status_single__hash_single_file(void);
+extern void test_status_worktree__initialize(void);
+extern void test_status_worktree__cleanup(void);
+extern void test_status_worktree__whole_repository(void);
+extern void test_status_worktree__empty_repository(void);
+extern void test_network_remotes__initialize(void);
+extern void test_network_remotes__cleanup(void);
+extern void test_network_remotes__parsing(void);
+extern void test_network_remotes__refspec_parsing(void);
+extern void test_network_remotes__fnmatch(void);
+extern void test_network_remotes__transform(void);
 extern void test_core_dirent__dont_traverse_dot(void);
 extern void test_core_dirent__traverse_subfolder(void);
 extern void test_core_dirent__traverse_slash_terminated_folder(void);
@@ -75,19 +86,10 @@ extern void test_core_rmdir__delete_recursive(void);
 extern void test_core_rmdir__fail_to_delete_non_empty_dir(void);
 extern void test_core_string__0(void);
 extern void test_core_string__1(void);
+extern void test_core_strtol__int32(void);
+extern void test_core_strtol__int64(void);
 extern void test_core_vector__0(void);
 extern void test_core_vector__1(void);
 extern void test_core_vector__2(void);
-extern void test_network_remotes__initialize(void);
-extern void test_network_remotes__cleanup(void);
-extern void test_network_remotes__parsing(void);
-extern void test_network_remotes__refspec_parsing(void);
-extern void test_network_remotes__fnmatch(void);
-extern void test_network_remotes__transform(void);
-extern void test_status_single__hash_single_file(void);
-extern void test_status_worktree__initialize(void);
-extern void test_status_worktree__cleanup(void);
-extern void test_status_worktree__whole_repository(void);
-extern void test_status_worktree__empty_repository(void);
 
 #endif
diff --git a/tests-clay/clay_main.c b/tests-clay/clay_main.c
index 9cbabb9..cca23f4 100644
--- a/tests-clay/clay_main.c
+++ b/tests-clay/clay_main.c
@@ -660,99 +660,107 @@ cl_fs_cleanup(void)
 
 
 static const struct clay_func _all_callbacks[] = {
-    {"dont_traverse_dot", &test_core_dirent__dont_traverse_dot, 0},
-	{"traverse_subfolder", &test_core_dirent__traverse_subfolder, 0},
-	{"traverse_slash_terminated_folder", &test_core_dirent__traverse_slash_terminated_folder, 0},
-	{"dont_traverse_empty_folders", &test_core_dirent__dont_traverse_empty_folders, 0},
-	{"traverse_weird_filenames", &test_core_dirent__traverse_weird_filenames, 0},
-	{"0", &test_core_filebuf__0, 1},
-	{"1", &test_core_filebuf__1, 1},
-	{"2", &test_core_filebuf__2, 1},
-	{"0", &test_core_path__0, 2},
-	{"1", &test_core_path__1, 2},
-	{"2", &test_core_path__2, 2},
-	{"5", &test_core_path__5, 2},
-	{"6", &test_core_path__6, 2},
-	{"delete_recursive", &test_core_rmdir__delete_recursive, 3},
-	{"fail_to_delete_non_empty_dir", &test_core_rmdir__fail_to_delete_non_empty_dir, 3},
-	{"0", &test_core_string__0, 4},
-	{"1", &test_core_string__1, 4},
-	{"0", &test_core_vector__0, 5},
-	{"1", &test_core_vector__1, 5},
-	{"2", &test_core_vector__2, 5},
-	{"parsing", &test_network_remotes__parsing, 6},
-	{"refspec_parsing", &test_network_remotes__refspec_parsing, 6},
-	{"fnmatch", &test_network_remotes__fnmatch, 6},
-	{"transform", &test_network_remotes__transform, 6},
-	{"hash_single_file", &test_status_single__hash_single_file, 7},
-	{"whole_repository", &test_status_worktree__whole_repository, 8},
-	{"empty_repository", &test_status_worktree__empty_repository, 8}
+    {"hash_single_file", &test_status_single__hash_single_file, 0},
+	{"whole_repository", &test_status_worktree__whole_repository, 1},
+	{"empty_repository", &test_status_worktree__empty_repository, 1},
+	{"parsing", &test_network_remotes__parsing, 2},
+	{"refspec_parsing", &test_network_remotes__refspec_parsing, 2},
+	{"fnmatch", &test_network_remotes__fnmatch, 2},
+	{"transform", &test_network_remotes__transform, 2},
+	{"dont_traverse_dot", &test_core_dirent__dont_traverse_dot, 3},
+	{"traverse_subfolder", &test_core_dirent__traverse_subfolder, 3},
+	{"traverse_slash_terminated_folder", &test_core_dirent__traverse_slash_terminated_folder, 3},
+	{"dont_traverse_empty_folders", &test_core_dirent__dont_traverse_empty_folders, 3},
+	{"traverse_weird_filenames", &test_core_dirent__traverse_weird_filenames, 3},
+	{"0", &test_core_filebuf__0, 4},
+	{"1", &test_core_filebuf__1, 4},
+	{"2", &test_core_filebuf__2, 4},
+	{"0", &test_core_path__0, 5},
+	{"1", &test_core_path__1, 5},
+	{"2", &test_core_path__2, 5},
+	{"5", &test_core_path__5, 5},
+	{"6", &test_core_path__6, 5},
+	{"delete_recursive", &test_core_rmdir__delete_recursive, 6},
+	{"fail_to_delete_non_empty_dir", &test_core_rmdir__fail_to_delete_non_empty_dir, 6},
+	{"0", &test_core_string__0, 7},
+	{"1", &test_core_string__1, 7},
+	{"int32", &test_core_strtol__int32, 8},
+	{"int64", &test_core_strtol__int64, 8},
+	{"0", &test_core_vector__0, 9},
+	{"1", &test_core_vector__1, 9},
+	{"2", &test_core_vector__2, 9}
 };
 
 static const struct clay_suite _all_suites[] = {
     {
+        "status::single",
+        {NULL, NULL, 0},
+        {NULL, NULL, 0},
+        &_all_callbacks[0], 1
+    },
+	{
+        "status::worktree",
+        {"initialize", &test_status_worktree__initialize, 1},
+        {"cleanup", &test_status_worktree__cleanup, 1},
+        &_all_callbacks[1], 2
+    },
+	{
+        "network::remotes",
+        {"initialize", &test_network_remotes__initialize, 2},
+        {"cleanup", &test_network_remotes__cleanup, 2},
+        &_all_callbacks[3], 4
+    },
+	{
         "core::dirent",
         {NULL, NULL, 0},
         {NULL, NULL, 0},
-        &_all_callbacks[0], 5
+        &_all_callbacks[7], 5
     },
 	{
         "core::filebuf",
         {NULL, NULL, 0},
         {NULL, NULL, 0},
-        &_all_callbacks[5], 3
+        &_all_callbacks[12], 3
     },
 	{
         "core::path",
         {NULL, NULL, 0},
         {NULL, NULL, 0},
-        &_all_callbacks[8], 5
+        &_all_callbacks[15], 5
     },
 	{
         "core::rmdir",
-        {"initialize", &test_core_rmdir__initialize, 3},
+        {"initialize", &test_core_rmdir__initialize, 6},
         {NULL, NULL, 0},
-        &_all_callbacks[13], 2
+        &_all_callbacks[20], 2
     },
 	{
         "core::string",
         {NULL, NULL, 0},
         {NULL, NULL, 0},
-        &_all_callbacks[15], 2
+        &_all_callbacks[22], 2
     },
 	{
-        "core::vector",
+        "core::strtol",
         {NULL, NULL, 0},
         {NULL, NULL, 0},
-        &_all_callbacks[17], 3
-    },
-	{
-        "network::remotes",
-        {"initialize", &test_network_remotes__initialize, 6},
-        {"cleanup", &test_network_remotes__cleanup, 6},
-        &_all_callbacks[20], 4
+        &_all_callbacks[24], 2
     },
 	{
-        "status::single",
+        "core::vector",
         {NULL, NULL, 0},
         {NULL, NULL, 0},
-        &_all_callbacks[24], 1
-    },
-	{
-        "status::worktree",
-        {"initialize", &test_status_worktree__initialize, 8},
-        {"cleanup", &test_status_worktree__cleanup, 8},
-        &_all_callbacks[25], 2
+        &_all_callbacks[26], 3
     }
 };
 
-static const char _suites_str[] = "core::dirent, core::filebuf, core::path, core::rmdir, core::string, core::vector, network::remotes, status::single, status::worktree";
+static const char _suites_str[] = "status::single, status::worktree, network::remotes, core::dirent, core::filebuf, core::path, core::rmdir, core::string, core::strtol, core::vector";
 
 int _MAIN_CC main(int argc, char *argv[])
 {
     return clay_test(
         argc, argv, _suites_str,
-        _all_callbacks, 27,
-        _all_suites, 9
+        _all_callbacks, 29,
+        _all_suites, 10
     );
 }
diff --git a/tests-clay/core/strtol.c b/tests-clay/core/strtol.c
new file mode 100644
index 0000000..41bf7f8
--- /dev/null
+++ b/tests-clay/core/strtol.c
@@ -0,0 +1,37 @@
+#include "clay_libgit2.h"
+
+void test_core_strtol__int32(void)
+{
+	int32_t i;
+
+	cl_git_pass(git__strtol32(&i, "123", NULL, 10));
+	cl_assert(i == 123);
+	cl_git_pass(git__strtol32(&i, "  +123 ", NULL, 10));
+	cl_assert(i == 123);
+	cl_git_pass(git__strtol32(&i, "  +2147483647 ", NULL, 10));
+	cl_assert(i == 2147483647);
+	cl_git_pass(git__strtol32(&i, "  -2147483648 ", NULL, 10));
+	cl_assert(i == -2147483648LL);
+	
+	cl_git_fail(git__strtol32(&i, "  2147483657 ", NULL, 10));
+	cl_git_fail(git__strtol32(&i, "  -2147483657 ", NULL, 10));
+}
+
+void test_core_strtol__int64(void)
+{
+	int64_t i;
+
+	cl_git_pass(git__strtol64(&i, "123", NULL, 10));
+	cl_assert(i == 123);
+	cl_git_pass(git__strtol64(&i, "  +123 ", NULL, 10));
+	cl_assert(i == 123);
+	cl_git_pass(git__strtol64(&i, "  +2147483647 ", NULL, 10));
+	cl_assert(i == 2147483647);
+	cl_git_pass(git__strtol64(&i, "  -2147483648 ", NULL, 10));
+	cl_assert(i == -2147483648LL);
+	cl_git_pass(git__strtol64(&i, "  2147483657 ", NULL, 10));
+	cl_assert(i == 2147483657LL);
+	cl_git_pass(git__strtol64(&i, "  -2147483657 ", NULL, 10));
+	cl_assert(i == -2147483657LL);
+}
+