From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: szeder.dev@gmail.com, email@benjaminfuchs.de,
git@vger.kernel.org, sandals@crustytoothpaste.net,
ville.skytta@iki.fi
Subject: Re: [RFC PATCH] rev-parse: add --show-superproject-working-tree
Date: Mon, 06 Mar 2017 23:16:41 -0800 [thread overview]
Message-ID: <xmqqr329y2sm.fsf@junio-linux.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqvarly8hn.fsf@junio-linux.mtv.corp.google.com> (Junio C. Hamano's message of "Mon, 06 Mar 2017 21:13:40 -0800")
Junio C Hamano <gitster@pobox.com> writes:
>> + dirname = relative_path(xgetcwd(), one_up, &sb);
>
> So, the idea is we start at the root level of the current project's
> working tree, and we go up one level, then we know the last component
> of the path our submodule is bound at in the superproject.
>
>> + prepare_submodule_repo_env(&cp.env_array);
>> + argv_array_pop(&cp.env_array);
>> + argv_array_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
>> + "ls-tree", "HEAD", "--", dirname, NULL);
>
> This would ask our superproject what is at the "dirname" in its
> HEAD. Two possible issues:
>
> - Shouldn't that be looking at its index instead? It would be more
> correct for unborn branch case, and new or moved submodule case.
>
> - If our submodule is bound at path sub/dir in the superproject,
> the relative-path thing above would get "dir" and this ls-tree
> ends up asking what is at "dir", but the question you really want
> to ask is what is at "sub/dir", isn't it?
IOW, the basic ontline of the idea may be OK, but I think you would
want to do something along this line:
- chdir to .. from the root of your submodule working tree;
- in that .. directory, ask what prefix it is (you'd get
"sub/dir", or "not a git" if you are not a submodule);
- in that .. directory, ask ls-files what sub/dir is;
- if it is 160000, you're happy.
next prev parent reply other threads:[~2017-03-07 7:18 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 20:44 [PATCH 0/4] git-prompt.sh: Full patch for submodule indicator Benjamin Fuchs
2017-01-30 20:44 ` [PATCH 1/4] git-prompt.sh: add " Benjamin Fuchs
2017-01-30 23:48 ` Junio C Hamano
2017-01-31 0:10 ` Benjamin Fuchs
2017-01-31 3:11 ` Junio C Hamano
2017-02-06 4:23 ` Stefan Beller
2017-02-06 5:55 ` Jacob Keller
2017-02-06 10:13 ` Stefan Beller
2017-01-30 20:44 ` [PATCH 2/4] git-prompt.sh: rework of " Benjamin Fuchs
2017-01-31 18:06 ` SZEDER Gábor
2017-01-30 20:44 ` [PATCH 3/4] git-prompt.sh: fix for submodule 'dirty' indicator Benjamin Fuchs
2017-01-30 20:44 ` [PATCH 4/4] git-prompt.sh: add tests for submodule indicator Benjamin Fuchs
2017-01-31 18:32 ` SZEDER Gábor
2017-01-31 22:06 ` Junio C Hamano
2017-01-31 22:12 ` Stefan Beller
2017-03-07 3:45 ` [RFC PATCH] rev-parse: add --show-superproject-working-tree Stefan Beller
2017-03-07 5:13 ` Junio C Hamano
2017-03-07 7:16 ` Junio C Hamano [this message]
2017-03-07 7:23 ` Junio C Hamano
2017-03-07 18:44 ` Junio C Hamano
2017-03-07 20:40 ` Stefan Beller
2017-03-07 22:49 ` Junio C Hamano
2017-03-08 0:56 ` [PATCHv2] " Stefan Beller
2017-03-08 1:30 ` Junio C Hamano
2017-03-08 6:01 ` Junio C Hamano
2017-03-08 19:20 ` [PATCHv3] " Stefan Beller
2017-03-08 22:28 ` Junio C Hamano
2017-03-08 23:07 ` [PATCHv4] " Stefan Beller
2017-03-08 23:51 ` Junio C Hamano
2017-03-17 22:28 ` Jonathan Nieder
2017-03-17 22:51 ` [PATCH] Documentation/git-worktree: use working tree for trees on the file system Stefan Beller
2017-03-17 22:55 ` Jonathan Nieder
2017-03-17 23:04 ` Stefan Beller
2017-03-18 17:24 ` Junio C Hamano
2017-03-18 1:47 ` Junio C Hamano
2017-03-18 1:36 ` Junio C Hamano
2017-03-20 17:29 ` Stefan Beller
2017-03-20 18:12 ` Junio C Hamano
2017-03-20 18:50 ` Jonathan Nieder
2017-03-20 19:22 ` [PATCH 0/2] use "working trees" instead of "worktree" in our API Stefan Beller
2017-03-20 19:22 ` [PATCH 1/2] git.c: introduce --working-tree superseding --work-tree Stefan Beller
2017-03-20 19:58 ` Jonathan Nieder
2017-03-20 19:22 ` [PATCH 2/2] revparse: introduce --is-inside-working-tree Stefan Beller
2017-03-20 20:00 ` Jonathan Nieder
2017-03-20 19:37 ` [PATCH 0/2] use "working trees" instead of "worktree" in our API Junio C Hamano
2017-03-21 10:37 ` [PATCH] Documentation/git-worktree: use working tree for trees on the file system Duy Nguyen
2017-03-21 15:48 ` Junio C Hamano
2017-03-23 17:06 ` Michael J Gruber
2017-03-23 17:55 ` Junio C Hamano
2017-03-25 12:07 ` Duy Nguyen
2017-04-07 13:59 ` Michael J Gruber
2017-04-07 16:14 ` Jacob Keller
2017-03-25 12:05 ` Duy Nguyen
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=xmqqr329y2sm.fsf@junio-linux.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=email@benjaminfuchs.de \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
--cc=sbeller@google.com \
--cc=szeder.dev@gmail.com \
--cc=ville.skytta@iki.fi \
/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).