Skip to content

Commit

Permalink
Merge branch 'ss/safe-create-leading-dir-with-slash'
Browse files Browse the repository at this point in the history
"git clone $origin foo\bar\baz" on Windows failed to create the
leading directories (i.e. a moral-equivalent of "mkdir -p").

* ss/safe-create-leading-dir-with-slash:
  safe_create_leading_directories(): on Windows, \ can separate path components
  • Loading branch information
Junio C Hamano committed Jan 27, 2014
2 parents d0956cf + 0f52740 commit 33d4669
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions sha1_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,21 @@ enum scld_error safe_create_leading_directories(char *path)

while (ret == SCLD_OK && next_component) {
struct stat st;
char *slash = strchr(next_component, '/');
char *slash = next_component, slash_character;

if (!slash)
while (*slash && !is_dir_sep(*slash))
slash++;

if (!*slash)
break;

next_component = slash + 1;
while (*next_component == '/')
while (is_dir_sep(*next_component))
next_component++;
if (!*next_component)
break;

slash_character = *slash;
*slash = '\0';
if (!stat(path, &st)) {
/* path exists */
Expand All @@ -148,7 +152,7 @@ enum scld_error safe_create_leading_directories(char *path)
} else if (adjust_shared_perm(path)) {
ret = SCLD_PERMS;
}
*slash = '/';
*slash = slash_character;
}
return ret;
}
Expand Down

0 comments on commit 33d4669

Please sign in to comment.