Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Thu, 18 Jun 2015 11:26:43 UTC Commit: 3aea4b728600f8a743e628746ed3d135bff97b31 https://github.com/geany/geany-plugins/commit/3aea4b728600f8a743e628746ed3d1...

Log Message: ----------- Merge branch 'git-changebar/wip'

* Fix a crash after reloading the plugin (#237). * Fix erroneous diff on last line with some files.

Modified Paths: -------------- git-changebar/src/gcb-plugin.c

Modified: git-changebar/src/gcb-plugin.c 19 lines changed, 18 insertions(+), 1 deletions(-) =================================================================== @@ -59,7 +59,7 @@ PLUGIN_SET_TRANSLATABLE_INFO ( #define QUIT_THREAD_JOB ((AsyncBlobContentsJob *) (&G_queue))

#define RESOURCES_ALLOCATED_QTAG \ - (g_quark_from_static_string (PLUGIN"/git-resources-allocated")) + (g_quark_from_string (PLUGIN"/git-resources-allocated"))

enum { @@ -179,6 +179,23 @@ static const struct { };

+/* workaround https://github.com/libgit2/libgit2/pull/3187 */ +static int +gcb_git_buf_grow (git_buf *buf, + size_t target_size) +{ + if (buf->asize == 0) { + if (target_size == 0) { + target_size = buf->size; + } + if ((target_size & 7) == 0) { + target_size++; + } + } + return git_buf_grow (buf, target_size); +} +#define git_buf_grow gcb_git_buf_grow + static void buf_zero (git_buf *buf) {

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).