mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clone: create intermediate directories of destination repo

Browse Source 
The shell version used to use "mkdir -p" to create the repo
path, but the C version just calls "mkdir". Let's replicate
the old behavior. We have to create the git and worktree
leading dirs separately; while most of the time, the
worktree dir contains the git dir (as .git), the user can
override this using GIT_WORK_TREE.

We can reuse safe_create_leading_directories, but we need to
make a copy of our const buffer to do so. Since
merge-recursive uses the same pattern, we can factor this
out into a global function. This has two other cleanup
advantages for merge-recursive:

  1. mkdir_p wasn't a very good name. "mkdir -p foo/bar" actually
     creates bar, but this function just creates the leading
     directories.

  2. mkdir_p took a mode argument, but it was completely
     ignored.

Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2008-06-25 01:41:34 -04:00
committed by Junio C Hamano
parent 4ace4fc584
commit 2beebd22f4
5 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin-merge-recursive.c
View File

@ -481,15 +481,6 @@ static char *unique_path(const char *path, const char *branch)
return newpath;
}
static int mkdir_p(const char *path, unsigned long mode)
{
/* path points to cache entries, so xstrdup before messing with it */
char *buf = xstrdup(path);
int result = safe_create_leading_directories(buf);
free(buf);
return result;
}
static void flush_buffer(int fd, const char *buf, unsigned long size)
{
while (size > 0) {
@ -512,7 +503,7 @@ static int make_room_for_path(const char *path)
int status;
const char *msg = "failed to create path '%s'%s";
status = mkdir_p(path, 0777);
status = safe_create_leading_directories_const(path);
if (status) {
if (status == -3) {
/* something else exists */
@ -583,7 +574,7 @@ static void update_file_flags(const unsigned char *sha,
close(fd);
} else if (S_ISLNK(mode)) {
char *lnk = xmemdupz(buf, size);
mkdir_p(path, 0777);
safe_create_leading_directories_const(path);
unlink(path);
symlink(lnk, path);
free(lnk);