mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
worktree: extract basename computation to new function
A subsequent patch will also need to compute the basename of the new worktree, so factor out this logic into a new function. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0ca560cb97
commit
f5682b2a86
|
@ -152,6 +152,25 @@ static void remove_junk_on_signal(int signo)
|
||||||
raise(signo);
|
raise(signo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const char *worktree_basename(const char *path, int *olen)
|
||||||
|
{
|
||||||
|
const char *name;
|
||||||
|
int len;
|
||||||
|
|
||||||
|
len = strlen(path);
|
||||||
|
while (len && is_dir_sep(path[len - 1]))
|
||||||
|
len--;
|
||||||
|
|
||||||
|
for (name = path + len - 1; name > path; name--)
|
||||||
|
if (is_dir_sep(*name)) {
|
||||||
|
name++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
*olen = len;
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
static int add_worktree(const char *path, const char **child_argv)
|
static int add_worktree(const char *path, const char **child_argv)
|
||||||
{
|
{
|
||||||
struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
|
struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
|
||||||
|
@ -165,15 +184,7 @@ static int add_worktree(const char *path, const char **child_argv)
|
||||||
if (file_exists(path) && !is_empty_dir(path))
|
if (file_exists(path) && !is_empty_dir(path))
|
||||||
die(_("'%s' already exists"), path);
|
die(_("'%s' already exists"), path);
|
||||||
|
|
||||||
len = strlen(path);
|
name = worktree_basename(path, &len);
|
||||||
while (len && is_dir_sep(path[len - 1]))
|
|
||||||
len--;
|
|
||||||
|
|
||||||
for (name = path + len - 1; name > path; name--)
|
|
||||||
if (is_dir_sep(*name)) {
|
|
||||||
name++;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
strbuf_addstr(&sb_repo,
|
strbuf_addstr(&sb_repo,
|
||||||
git_path("worktrees/%.*s", (int)(path + len - name), name));
|
git_path("worktrees/%.*s", (int)(path + len - name), name));
|
||||||
len = sb_repo.len;
|
len = sb_repo.len;
|
||||||
|
|
Loading…
Reference in a new issue