From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Jacob Keller <jacob.keller@gmail.com>,
Norio Nomura <norio.nomura@gmail.com>
Subject: Re: [PATCHv2 4/5] submodule--helper, module_clone: always operate on absolute paths
Date: Thu, 31 Mar 2016 15:59:29 -0700 [thread overview]
Message-ID: <CAGZ79kaAs_ZwxfhLSTw3z8JY33vGToms2z6zYEiCmRpfS6SA+Q@mail.gmail.com> (raw)
In-Reply-To: <xmqqfuv6l1xf.fsf@gitster.mtv.corp.google.com>
On Thu, Mar 31, 2016 at 3:26 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> + if (!is_absolute_path(sm_gitdir)) {
>> + char *cwd = xgetcwd();
>> + strbuf_addf(&sb, "%s/%s", cwd, sm_gitdir);
>> + sm_gitdir = strbuf_detach(&sb, 0);
>> + free(cwd);
>
> It would be surprising that this would be the first codepath that
> needs to get an absolute pathname in the codebase that is more than
> 10 years old, wouldn't it? Don't we have a reasonable API helper
> function to do this kind of thing already?
>
> ... goes and looks ...
>
> Doesn't absolute_path() work here?
*reads absolute_path(...)*
Yes that is great. But why is it written the way it is?
I would have expected:
const char *absolute_path(const char *path)
{
static struct strbuf sb = STRBUF_INIT;
- strbuf_reset(&sb);
strbuf_add_absolute_path(&sb, path);
- return sb.buf;
+ return strbuf_detach(&sb);
}
Further checking reveals any caller uses it with
desired= xstrdup(absolute_path(my_argument));
We are loosing memory of the strbuf here. so if I we'd
take the diff above we can also get rid of all the xstrdups
at the callers. For now I will adhere to all other callers and use
xstrdup(absolute_path(...) here too.
I'll remove the unrelated changes as well in a resend.
>
>> @@ -221,7 +240,6 @@ static int module_clone(int argc, const char **argv, const char *prefix)
>> submodule_dot_git = fopen(sb.buf, "w");
>> if (!submodule_dot_git)
>> die_errno(_("cannot open file '%s'"), sb.buf);
>> -
>> fprintf(submodule_dot_git, "gitdir: %s\n",
>> relative_path(sm_gitdir, path, &rel_path));
>> if (fclose(submodule_dot_git))
>
> Looks like an unrelated change to me.
>
>> @@ -229,24 +247,16 @@ static int module_clone(int argc, const char **argv, const char *prefix)
>> strbuf_reset(&sb);
>> strbuf_reset(&rel_path);
>>
>> - cwd = xgetcwd();
>> /* Redirect the worktree of the submodule in the superproject's config */
>> - if (!is_absolute_path(sm_gitdir)) {
>> - strbuf_addf(&sb, "%s/%s", cwd, sm_gitdir);
>> - free(sm_gitdir);
>> - sm_gitdir = strbuf_detach(&sb, NULL);
>> - }
>> -
>> - strbuf_addf(&sb, "%s/%s", cwd, path);
>> p = git_pathdup_submodule(path, "config");
>> if (!p)
>> die(_("could not get submodule directory for '%s'"), path);
>> git_config_set_in_file(p, "core.worktree",
>> - relative_path(sb.buf, sm_gitdir, &rel_path));
>> + relative_path(path, sm_gitdir, &rel_path));
>> strbuf_release(&sb);
>> strbuf_release(&rel_path);
>> free(sm_gitdir);
>> - free(cwd);
>> +
>
> This addition of blank, too.
>
>> free(p);
>> return 0;
>> }
>> diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
>> index fc11809..ea3fabb 100755
>> --- a/t/t7400-submodule-basic.sh
>> +++ b/t/t7400-submodule-basic.sh
>> @@ -818,7 +818,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
>> )
>> '
>>
>> -test_expect_failure 'recursive relative submodules stay relative' '
>> +test_expect_success 'recursive relative submodules stay relative' '
>> test_when_finished "rm -rf super clone2 subsub sub3" &&
>> mkdir subsub &&
>> (
next prev parent reply other threads:[~2016-03-31 22:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 21:04 [PATCHv2 0/5] Fix relative path issues in recursive submodules Stefan Beller
2016-03-31 21:04 ` [PATCHv2 1/5] recursive submodules: test for relative paths Stefan Beller
2016-03-31 21:04 ` [PATCHv2 2/5] submodule--helper clone: simplify path check Stefan Beller
2016-03-31 21:23 ` Eric Sunshine
2016-03-31 21:04 ` [PATCHv2 3/5] submodule--helper clone: remove double path checking Stefan Beller
2016-03-31 21:58 ` Eric Sunshine
2016-03-31 22:21 ` Junio C Hamano
2016-03-31 21:04 ` [PATCHv2 4/5] submodule--helper, module_clone: always operate on absolute paths Stefan Beller
2016-03-31 22:26 ` Junio C Hamano
2016-03-31 22:59 ` Stefan Beller [this message]
2016-03-31 23:08 ` Stefan Beller
2016-03-31 21:04 ` [PATCHv2 5/5] submodule--helper, module_clone: catch fprintf failure Stefan Beller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kaAs_ZwxfhLSTw3z8JY33vGToms2z6zYEiCmRpfS6SA+Q@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=norio.nomura@gmail.com \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).