From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
git@drmicha.warpmail.net, max.nordlund@sqore.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 3/3] init: reuse original_git_dir in set_git_dir_init()
Date: Wed, 21 Sep 2016 18:29:39 +0700 [thread overview]
Message-ID: <20160921112939.3444-4-pclouds@gmail.com> (raw)
In-Reply-To: <20160921112939.3444-1-pclouds@gmail.com>
Since original_git_dir is a copy of real_path(git_dir), let's reuse it
and avoid calling real_path() more than necessary.
The xstrdup() is removed too because original_git_dir is already a copy,
and we're not going to free git_link in this code probably forever.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/init-db.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 0d5cc76..d70fc45 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -330,11 +330,11 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir,
* make sure symlinks are resolved because we'll be
* moving the target repo later on in separate_git_dir()
*/
- git_link = xstrdup(real_path(git_dir));
+ git_link = original_git_dir;
set_git_dir(real_path(real_git_dir));
}
else {
- set_git_dir(real_path(git_dir));
+ set_git_dir(original_git_dir);
git_link = NULL;
}
startup_info->have_repository = 1;
--
2.8.2.524.g6ff3d78
next prev parent reply other threads:[~2016-09-21 11:30 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-23 12:35 Bug with git worktrees and git init Max Nordlund
2016-08-23 15:21 ` Michael J Gruber
2016-08-24 9:35 ` Duy Nguyen
2016-09-08 13:47 ` [PATCH 0/3] Fix git-init in linked worktrees Nguyễn Thái Ngọc Duy
2016-09-08 13:47 ` [PATCH 1/3] init: correct re-initialization from a linked worktree Nguyễn Thái Ngọc Duy
2016-09-08 19:37 ` Junio C Hamano
2016-09-09 10:36 ` Duy Nguyen
2016-09-08 13:47 ` [PATCH 2/3] t0001: work around the bug that reads config file before repo setup Nguyễn Thái Ngọc Duy
2016-09-08 19:44 ` Junio C Hamano
2016-09-08 20:02 ` Jeff King
2016-09-09 10:32 ` Duy Nguyen
2016-09-09 11:22 ` Jeff King
2016-09-09 17:45 ` Jacob Keller
2016-09-08 13:47 ` [PATCH 3/3] init: do not set core.worktree more often than necessary Nguyễn Thái Ngọc Duy
2016-09-08 19:54 ` Junio C Hamano
2016-09-09 10:33 ` Duy Nguyen
2016-09-21 11:29 ` [PATCH v2 0/3] Fix git-init in linked worktrees Nguyễn Thái Ngọc Duy
2016-09-21 11:29 ` [PATCH v2 1/3] init: correct re-initialization from a linked worktree Nguyễn Thái Ngọc Duy
2016-09-21 11:29 ` [PATCH v2 2/3] init: do not set core.worktree more often than necessary Nguyễn Thái Ngọc Duy
2016-09-21 18:44 ` Junio C Hamano
2016-09-22 10:06 ` Duy Nguyen
2016-09-22 17:27 ` Junio C Hamano
2016-09-23 11:12 ` [PATCH v2 4/3] init: combine set_git_dir_init() and init_db() into one Nguyễn Thái Ngọc Duy
2016-09-23 15:18 ` Junio C Hamano
2016-09-23 22:53 ` Junio C Hamano
2016-09-24 18:55 ` Junio C Hamano
2016-09-25 3:13 ` Duy Nguyen
2016-09-25 3:14 ` [PATCH v3 1/5] init: correct re-initialization from a linked worktree Nguyễn Thái Ngọc Duy
2016-09-25 3:14 ` [PATCH v3 2/5] init: call set_git_dir_init() from within init_db() Nguyễn Thái Ngọc Duy
2016-09-25 3:14 ` [PATCH v3 3/5] init: kill set_git_dir_init() Nguyễn Thái Ngọc Duy
2016-09-25 3:14 ` [PATCH v3 4/5] init: do not set unnecessary core.worktree Nguyễn Thái Ngọc Duy
2016-09-25 3:14 ` [PATCH v3 5/5] init: kill git_link variable Nguyễn Thái Ngọc Duy
2016-09-21 11:29 ` Nguyễn Thái Ngọc Duy [this message]
2016-09-21 18:18 ` [PATCH v2 0/3] Fix git-init in linked worktrees Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160921112939.3444-4-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=max.nordlund@sqore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).