@matheusbsbs / matheus-bagliano / commits / b31d20227a
Fork 0

init: remove unnecessary check

git_dir must always be non-NULL so "if (git_dir)" is unnecessary. Before this code, if git_dir == NULL, it will default to DEFAULT_GIT_DIR_ENVIRONMENT. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Mar 3, 2011 at 19:34 UTC b31d20227a4e3c71cf545d2142996e27cacadcec
1 file changed +5 -7
builtin/init-db.c
+5 -7
@@ -498,13 +498,11 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
498 is_bare_repository_cfg = guess_repository_type(git_dir);
499
500 if (!is_bare_repository_cfg) {
501 - if (git_dir) {
502 - const char *git_dir_parent = strrchr(git_dir, '/');
503 - if (git_dir_parent) {
504 - char *rel = xstrndup(git_dir, git_dir_parent - git_dir);
505 - git_work_tree_cfg = xstrdup(make_absolute_path(rel));
506 - free(rel);
507 - }
501 + const char *git_dir_parent = strrchr(git_dir, '/');
502 + if (git_dir_parent) {
503 + char *rel = xstrndup(git_dir, git_dir_parent - git_dir);
504 + git_work_tree_cfg = xstrdup(make_absolute_path(rel));
505 + free(rel);
506 }
507 if (!git_work_tree_cfg) {
508 git_work_tree_cfg = xcalloc(PATH_MAX, 1);