Commit 85f51bbadd426ab2f3f7fc70e879ac6763354479
2018-07-16T07:49:08
scan upwards for git repositories
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
diff --git a/lib/repository.c b/lib/repository.c
index 4cda42e..ed9663e 100644
--- a/lib/repository.c
+++ b/lib/repository.c
@@ -23,6 +23,8 @@
#include <sha1.h>
#include <string.h>
#include <zlib.h>
+#include <errno.h>
+#include <libgen.h>
#include "got_error.h"
#include "got_reference.h"
@@ -296,11 +298,96 @@ got_repo_get_cached_commit(struct got_repository *repo,
}
const struct got_error *
-got_repo_open(struct got_repository **ret, const char *path)
+open_repo(struct got_repository *repo, const char *path)
+{
+ const struct got_error *err = NULL;
+ struct got_worktree *worktree = NULL;
+
+ /* bare git repository? */
+ repo->path_git_dir = strdup(path);
+ if (repo->path_git_dir == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ if (is_git_repo(repo)) {
+ repo->path = strdup(repo->path_git_dir);
+ if (repo->path == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ return NULL;
+ }
+
+ /* git repository with working tree? */
+ free(repo->path_git_dir);
+ if (asprintf(&repo->path_git_dir, "%s/%s", path, GOT_GIT_DIR) == -1) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ if (is_git_repo(repo)) {
+ repo->path = strdup(path);
+ if (repo->path == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ return NULL;
+ }
+
+ /* got work tree checked out from bare git repository? */
+ free(repo->path_git_dir);
+ repo->path_git_dir = NULL;
+ err = got_worktree_open(&worktree, path);
+ if (err) {
+ if (err->code == GOT_ERR_ERRNO && errno == ENOENT)
+ err = got_error(GOT_ERR_NOT_GIT_REPO);
+ goto done;
+ }
+ repo->path_git_dir = strdup(worktree->repo_path);
+ if (repo->path_git_dir == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+
+ /* got work tree checked out from git repository with working tree? */
+ if (!is_git_repo(repo)) {
+ free(repo->path_git_dir);
+ if (asprintf(&repo->path_git_dir, "%s/%s", worktree->repo_path,
+ GOT_GIT_DIR) == -1) {
+ err = got_error_from_errno();
+ repo->path_git_dir = NULL;
+ goto done;
+ }
+ if (!is_git_repo(repo)) {
+ err = got_error(GOT_ERR_NOT_GIT_REPO);
+ goto done;
+ }
+ repo->path = strdup(worktree->repo_path);
+ if (repo->path == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ } else {
+ repo->path = strdup(repo->path_git_dir);
+ if (repo->path == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ }
+done:
+ if (worktree)
+ got_worktree_close(worktree);
+ return err;
+}
+
+const struct got_error *
+got_repo_open(struct got_repository **repop, const char *path)
{
struct got_repository *repo = NULL;
const struct got_error *err = NULL;
- char *abspath;
+ char *abspath, *normpath = NULL;
+ int tried_root = 0;
+
+ *repop = NULL;
if (got_path_is_absolute(path))
abspath = strdup(path);
@@ -341,57 +428,37 @@ got_repo_open(struct got_repository **ret, const char *path)
goto done;
}
- repo->path = got_path_normalize(abspath);
- if (repo->path == NULL) {
+ normpath = got_path_normalize(abspath);
+ if (normpath == NULL) {
err = got_error(GOT_ERR_BAD_PATH);
goto done;
}
- repo->path_git_dir = strdup(repo->path);
- if (repo->path_git_dir == NULL) {
- err = got_error_from_errno();
- goto done;
- }
- if (!is_git_repo(repo)) {
- free(repo->path_git_dir);
- if (asprintf(&repo->path_git_dir, "%s/%s", repo->path,
- GOT_GIT_DIR) == -1) {
- err = got_error_from_errno();
- goto done;
- }
- if (!is_git_repo(repo)) {
- struct got_worktree *worktree;
- if (got_worktree_open(&worktree, repo->path) == NULL) {
- free(repo->path_git_dir);
- repo->path_git_dir =
- strdup(worktree->repo_path);
- if (repo->path_git_dir == NULL) {
- err = got_error_from_errno();
- goto done;
- }
- if (!is_git_repo(repo)) {
- free(repo->path_git_dir);
- if (asprintf(&repo->path_git_dir,
- "%s/%s", worktree->repo_path,
- GOT_GIT_DIR) == -1) {
- err = got_error_from_errno();
- goto done;
- }
- }
- got_worktree_close(worktree);
+ path = normpath;
+ do {
+ err = open_repo(repo, path);
+ if (err == NULL)
+ break;
+ if (err->code != GOT_ERR_NOT_GIT_REPO)
+ break;
+ if (path[0] == '/' && path[1] == '\0') {
+ if (tried_root) {
+ err = got_error(GOT_ERR_NOT_GIT_REPO);
+ break;
}
+ tried_root = 1;
}
- if (!is_git_repo(repo)) {
- err = got_error(GOT_ERR_NOT_GIT_REPO);
- goto done;
- }
- }
-
- *ret = repo;
+ path = dirname(path);
+ if (path == NULL)
+ err = got_error_from_errno();
+ } while (path);
done:
if (err)
got_repo_close(repo);
+ else
+ *repop = repo;
free(abspath);
+ free(normpath);
return err;
}