diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-11-30 08:24:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-01 19:00:11 (GMT) |
| commit | 1a83c240f2fe7a0caa94009f066d15fa677d32cd (patch) | |
| tree | c402a9e78d6130038fdcde0df3b984c577e9ba9b /builtin/checkout.c | |
| parent | dcf692625ac569fefbe52269061230f4fde10e47 (diff) | |
| download | git-1a83c240f2fe7a0caa94009f066d15fa677d32cd.zip git-1a83c240f2fe7a0caa94009f066d15fa677d32cd.tar.gz git-1a83c240f2fe7a0caa94009f066d15fa677d32cd.tar.bz2 | |
git_snpath(): retire and replace with strbuf_git_path()
In the previous patch, git_snpath() is modified to allocate a new
strbuf buffer because vsnpath() needs that. But that makes it
awkward because git_snpath() receives a pre-allocated buffer from
outside and has to copy data back. Rename it to strbuf_git_path()
and make it receive strbuf directly.
Using git_path() in update_refs_for_switch() which used to call
git_snpath() is safe because that function and all of its callers do
not keep any pointer to the round-robin buffer pool allocated by
get_pathname().
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index c600ec1..195aca7 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -588,18 +588,21 @@ static void update_refs_for_switch(const struct checkout_opts *opts, if (opts->new_orphan_branch) { if (opts->new_branch_log && !log_all_ref_updates) { int temp; - char log_file[PATH_MAX]; - const char *ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch); + struct strbuf log_file = STRBUF_INIT; + int ret; + const char *ref_name; + ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch); temp = log_all_ref_updates; log_all_ref_updates = 1; - if (log_ref_setup(ref_name, log_file, sizeof(log_file))) { + ret = log_ref_setup(ref_name, &log_file); + log_all_ref_updates = temp; + strbuf_release(&log_file); + if (ret) { fprintf(stderr, _("Can not do reflog for '%s'\n"), opts->new_orphan_branch); - log_all_ref_updates = temp; return; } - log_all_ref_updates = temp; } } else |