Skip to content

Commit 822d940

Browse files
pcloudsgitster
authored andcommitted
init: kill git_link variable
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6311cfa commit 822d940

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

builtin/init-db.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
static int init_is_bare_repository = 0;
2323
static int init_shared_repository = -1;
2424
static const char *init_db_template_dir;
25-
static const char *git_link;
2625

2726
static void copy_templates_1(struct strbuf *path, struct strbuf *template,
2827
DIR *dir)
@@ -312,7 +311,7 @@ static void create_object_directory(void)
312311
strbuf_release(&path);
313312
}
314313

315-
static void separate_git_dir(const char *git_dir)
314+
static void separate_git_dir(const char *git_dir, const char *git_link)
316315
{
317316
struct stat st;
318317

@@ -349,22 +348,15 @@ int init_db(const char *git_dir, const char *real_git_dir,
349348
if (!exist_ok && !stat(real_git_dir, &st))
350349
die(_("%s already exists"), real_git_dir);
351350

352-
/*
353-
* make sure symlinks are resolved because we'll be
354-
* moving the target repo later on in separate_git_dir()
355-
*/
356-
git_link = xstrdup(real_path(git_dir));
357351
set_git_dir(real_path(real_git_dir));
352+
git_dir = get_git_dir();
353+
separate_git_dir(git_dir, original_git_dir);
358354
}
359355
else {
360356
set_git_dir(real_path(git_dir));
361-
git_link = NULL;
357+
git_dir = get_git_dir();
362358
}
363359
startup_info->have_repository = 1;
364-
git_dir = get_git_dir();
365-
366-
if (git_link)
367-
separate_git_dir(git_dir);
368360

369361
safe_create_dir(git_dir, 0);
370362

0 commit comments

Comments
 (0)