Created
October 23, 2016 18:55
-
-
Save intact/f7374bb0c6743a9a378659594f09afc9 to your computer and use it in GitHub Desktop.
gcb-plugin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -upr a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c | |
--- a/git-changebar/src/gcb-plugin.c 2016-07-10 10:22:27.000000000 +0200 | |
+++ b/git-changebar/src/gcb-plugin.c 2016-10-23 20:42:58.000000000 +0200 | |
@@ -419,20 +419,24 @@ worker_thread (gpointer data) | |
} | |
} | |
} | |
- if (! repo && git_repository_open_ext (&repo, path, 0, NULL) == 0) { | |
- if (git_repository_is_bare (repo)) { | |
- git_repository_free (repo); | |
- repo = NULL; | |
- } else if (G_monitoring_enabled) { | |
- /* we need to monitor HEAD, in case of e.g. branch switch (e.g. | |
- * git checkout -b will switch the ref we need to watch) */ | |
- monitors[0] = monitor_repo_file (repo, "HEAD", | |
- G_CALLBACK (on_git_repo_changed), | |
- GINT_TO_POINTER (TRUE)); | |
- /* and of course the real ref (branch) for when changes get committed */ | |
- monitors[1] = monitor_head_ref (repo, G_CALLBACK (on_git_repo_changed), | |
- GINT_TO_POINTER (FALSE)); | |
+ if (! repo) { | |
+ gchar *dirname = g_path_get_dirname (path); | |
+ if (git_repository_open_ext (&repo, dirname, 0, NULL) == 0) { | |
+ if (git_repository_is_bare (repo)) { | |
+ git_repository_free (repo); | |
+ repo = NULL; | |
+ } else if (G_monitoring_enabled) { | |
+ /* we need to monitor HEAD, in case of e.g. branch switch (e.g. | |
+ * git checkout -b will switch the ref we need to watch) */ | |
+ monitors[0] = monitor_repo_file (repo, "HEAD", | |
+ G_CALLBACK (on_git_repo_changed), | |
+ GINT_TO_POINTER (TRUE)); | |
+ /* and of course the real ref (branch) for when changes get committed */ | |
+ monitors[1] = monitor_head_ref (repo, G_CALLBACK (on_git_repo_changed), | |
+ GINT_TO_POINTER (FALSE)); | |
+ } | |
} | |
+ g_free(dirname); | |
} | |
buf_zero (&job->buf); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment