diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/attr.c | 16 | ||||
| -rw-r--r-- | src/fileops.c | 8 | ||||
| -rw-r--r-- | src/ignore.c | 4 | ||||
| -rw-r--r-- | src/path.c | 19 | ||||
| -rw-r--r-- | src/path.h | 2 | ||||
| -rw-r--r-- | src/repository.c | 16 |
6 files changed, 41 insertions, 24 deletions
diff --git a/src/attr.c b/src/attr.c index dee84b0ab..a02172689 100644 --- a/src/attr.c +++ b/src/attr.c @@ -377,7 +377,7 @@ static int push_attr_file( return error; } -static int push_one_attr(void *ref, git_buf *path) +static int push_one_attr(void *ref, const char *path) { int error = 0, n_src, i; attr_walk_up_info *info = (attr_walk_up_info *)ref; @@ -388,7 +388,7 @@ static int push_one_attr(void *ref, git_buf *path) for (i = 0; !error && i < n_src; ++i) error = push_attr_file( - info->repo, info->files, src[i], path->ptr, GIT_ATTR_FILE); + info->repo, info->files, src[i], path, GIT_ATTR_FILE); return error; } @@ -422,10 +422,8 @@ static int collect_attr_files( /* Resolve path in a non-bare repo */ if (workdir != NULL) error = git_path_find_dir(&dir, path, workdir); - /* when in a bare repo, find the containing folder if the given - * path is a subfolder (if not, the containing folder is the root) */ - else if (strchr(path, '/') != NULL) - error = git_path_dirname_r(&dir, path); + else + error = git_path_dirname_r(&dir, path); if (error < 0) goto cleanup; @@ -449,7 +447,11 @@ static int collect_attr_files( giterr_clear(); /* no error even if there is no index */ info.files = files; - error = git_path_walk_up(&dir, workdir, push_one_attr, &info); + if (!strcmp(dir.ptr, ".")) + error = push_one_attr(&info, ""); + else + error = git_path_walk_up(&dir, workdir, push_one_attr, &info); + if (error < 0) goto cleanup; diff --git a/src/fileops.c b/src/fileops.c index 34659ad3b..bd9d27c7a 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -505,15 +505,15 @@ static int futils__rmdir_recurs_foreach(void *opaque, git_buf *path) return error; } -static int futils__rmdir_empty_parent(void *opaque, git_buf *path) +static int futils__rmdir_empty_parent(void *opaque, const char *path) { futils__rmdir_data *data = opaque; int error = 0; - if (git_buf_len(path) <= data->baselen) + if (strlen(path) <= data->baselen) error = GIT_ITEROVER; - else if (p_rmdir(git_buf_cstr(path)) < 0) { + else if (p_rmdir(path) < 0) { int en = errno; if (en == ENOENT || en == ENOTDIR) { @@ -521,7 +521,7 @@ static int futils__rmdir_empty_parent(void *opaque, git_buf *path) } else if (en == ENOTEMPTY || en == EEXIST || en == EBUSY) { error = GIT_ITEROVER; } else { - error = git_path_set_error(errno, git_buf_cstr(path), "rmdir"); + error = git_path_set_error(errno, path, "rmdir"); } } diff --git a/src/ignore.c b/src/ignore.c index 78f01ac44..520bcfe41 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -91,11 +91,11 @@ static int push_ignore_file( return error; } -static int push_one_ignore(void *payload, git_buf *path) +static int push_one_ignore(void *payload, const char *path) { git_ignores *ign = payload; ign->depth++; - return push_ignore_file(ign, &ign->ign_path, path->ptr, GIT_IGNORE_FILE); + return push_ignore_file(ign, &ign->ign_path, path, GIT_IGNORE_FILE); } static int get_internal_ignores(git_attr_file **out, git_repository *repo) diff --git a/src/path.c b/src/path.c index 11c022812..67133f97e 100644 --- a/src/path.c +++ b/src/path.c @@ -417,7 +417,7 @@ int git_path_fromurl(git_buf *local_path_out, const char *file_url) int git_path_walk_up( git_buf *path, const char *ceiling, - int (*cb)(void *data, git_buf *), + int (*cb)(void *data, const char *), void *data) { int error = 0; @@ -435,12 +435,20 @@ int git_path_walk_up( } scan = git_buf_len(path); + /* empty path: yield only once */ + if (!scan) { + error = cb(data, ""); + if (error) + giterr_set_after_callback(error); + return error; + } + iter.ptr = path->ptr; iter.size = git_buf_len(path); iter.asize = path->asize; while (scan >= stop) { - error = cb(data, &iter); + error = cb(data, iter.ptr); iter.ptr[scan] = oldc; if (error) { @@ -460,6 +468,13 @@ int git_path_walk_up( if (scan >= 0) iter.ptr[scan] = oldc; + /* relative path: yield for the last component */ + if (!error && stop == 0 && iter.ptr[0] != '/') { + error = cb(data, ""); + if (error) + giterr_set_after_callback(error); + } + return error; } diff --git a/src/path.h b/src/path.h index d0a9de707..11bb6d173 100644 --- a/src/path.h +++ b/src/path.h @@ -323,7 +323,7 @@ extern int git_path_cmp( extern int git_path_walk_up( git_buf *pathbuf, const char *ceiling, - int (*callback)(void *payload, git_buf *path), + int (*callback)(void *payload, const char *path), void *payload); /** diff --git a/src/repository.c b/src/repository.c index 39a4f02b9..51d39eb6d 100644 --- a/src/repository.c +++ b/src/repository.c @@ -1691,20 +1691,20 @@ int git_repository_set_bare(git_repository *repo) if (repo->is_bare) return 0; - if ((error = git_repository_config__weakptr(&config, repo)) < 0 || - (error = git_config_set_bool(config, "core.bare", false)) < 0) - goto done; + if ((error = git_repository_config__weakptr(&config, repo)) < 0) + return error; + + if ((error = git_config_set_bool(config, "core.bare", false)) < 0) + return error; - error = git_config__update_entry(config, "core.worktree", NULL, true, true); + if ((error = git_config__update_entry(config, "core.worktree", NULL, true, true)) < 0) + return error; git__free(repo->workdir); repo->workdir = NULL; - repo->is_bare = 1; -done: - git_config_free(config); - return error; + return 0; } int git_repository_head_tree(git_tree **tree, git_repository *repo) |