diff options
| author | Russell Belfer <rb@github.com> | 2012-07-31 17:02:54 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-08-22 16:07:19 -0700 |
| commit | ca1b6e54095a7e28d468a832f143025feae6cd4f (patch) | |
| tree | 0ff9b9fbf71cd4f0489985b64f57590687361cd2 /src/attr_file.c | |
| parent | 662880ca60e4d1662bb10648522242ac54797720 (diff) | |
| download | libgit2-ca1b6e54095a7e28d468a832f143025feae6cd4f.tar.gz | |
Add template dir and set gid to repo init
This extends git_repository_init_ext further with support for
initializing the repository from an external template directory
and with support for the "create shared" type flags that make a
set GID repository directory.
This also adds tests for much of the new functionality to the
existing `repo/init.c` test suite.
Also, this adds a bunch of new utility functions including a
very general purpose `git_futils_mkdir` (with the ability to
make paths and to chmod the paths post-creation) and a file
tree copying function `git_futils_cp_r`. Also, this includes
some new path functions that were useful to keep the code
simple.
Diffstat (limited to 'src/attr_file.c')
| -rw-r--r-- | src/attr_file.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/attr_file.c b/src/attr_file.c index 20b3cf631..b2f312e3e 100644 --- a/src/attr_file.c +++ b/src/attr_file.c @@ -250,18 +250,15 @@ git_attr_assignment *git_attr_rule__lookup_assignment( int git_attr_path__init( git_attr_path *info, const char *path, const char *base) { + ssize_t root; + /* build full path as best we can */ git_buf_init(&info->full, 0); - if (base != NULL && git_path_root(path) < 0) { - if (git_buf_joinpath(&info->full, base, path) < 0) - return -1; - info->path = info->full.ptr + strlen(base); - } else { - if (git_buf_sets(&info->full, path) < 0) - return -1; - info->path = info->full.ptr; - } + if (git_path_join_unrooted(&info->full, path, base, &root) < 0) + return -1; + + info->path = info->full.ptr + root; /* remove trailing slashes */ while (info->full.size > 0) { |