Commit 50dd6ca54cfdfc362147f09ece4996970d0352bd
2010-11-17T04:58:32
Fix repository initialization We cannot assume that non-bare repositories have an index file, because 'git index' doesn't create it by default. Signed-off-by: Vicent Marti <tanoku@gmail.com>
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
diff --git a/src/repository.c b/src/repository.c
index ef51b08..5dd1fdf 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -68,8 +68,8 @@ int git__objtable_haskey(void *object, const void *key)
static int parse_repository_folders(git_repository *repo, const char *repository_path)
{
- char path_aux[GIT_PATH_MAX];
- int path_len, i;
+ char path_aux[GIT_PATH_MAX], *last_folder;
+ int path_len;
if (gitfo_isdir(repository_path) < 0)
return GIT_ENOTAREPO;
@@ -97,22 +97,24 @@ static int parse_repository_folders(git_repository *repo, const char *repository
if (gitfo_exists(path_aux) < 0)
return GIT_ENOTAREPO;
- i = path_len - 2;
- while (path_aux[i] != '/')
- i--;
+ path_aux[path_len] = 0;
- if (strcmp(path_aux, "/.git/") == 0) {
- repo->is_bare = 0;
+ last_folder = (path_aux + path_len - 2);
- path_aux[i + 1] = 0;
- repo->path_workdir = git__strdup(path_aux);
+ while (*last_folder != '/')
+ last_folder--;
+
+ if (strcmp(last_folder, "/.git/") == 0) {
+ repo->is_bare = 0;
/* index file */
strcpy(path_aux + path_len, "index");
- if (gitfo_exists(path_aux) < 0)
- return GIT_ENOTAREPO;
repo->path_index = git__strdup(path_aux);
+ /* working dir */
+ *(last_folder + 1) = 0;
+ repo->path_workdir = git__strdup(path_aux);
+
} else {
repo->is_bare = 1;
repo->path_workdir = NULL;
@@ -199,7 +201,7 @@ git_index *git_repository_index(git_repository *repo)
if (git_index_open_inrepo(&repo->index, repo) < 0)
return NULL;
- assert(repo->index && repo->index->on_disk);
+ assert(repo->index);
}
return repo->index;