git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v7 2/2] path: implement common_dir handling in git_path_submodule()

From
Stefan Beller <sbeller@google.com>
Date
Aug 17, 2015, 23:56 UTC
Message-ID
<CAGZ79kbCg1x0s_5eRLuxGs-7=-KvxLwpZ1h7ZFeZ-Yhgwfwe_Q@mail.gmail.com>
In-Reply-To
<1438725925-3689-3-git-send-email-max@max630.net>
On Tue, Aug 4, 2015 at 3:05 PM, Max Kirillov <max@max630.net> wrote:
Show 52 quoted lines
> When submodule is a linked worktree, "git diff --submodule" and other
> calls which directly access the submodule's object database do not correctly
> calculate its path. Fix it by changing the git_path_submodule() behavior,
> to use either common or per-worktree directory.
>
> Do it similarly as for parent repository, but ignore the GIT_COMMON_DIR
> environment variable, because it would mean common directory for the parent
> repository and does not make sense for submodule.
>
> Also add test for functionality which uses this call.
>
> Signed-off-by: Max Kirillov <max@max630.net>
> ---
>  cache.h                          |  1 +
>  path.c                           | 24 ++++++++++++++++++++----
>  setup.c                          | 17 ++++++++++++-----
>  t/t7410-submodule-checkout-to.sh | 10 ++++++++++
>  4 files changed, 43 insertions(+), 9 deletions(-)
>
> diff --git a/cache.h b/cache.h
> index 4f55466..b87ec75 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -442,6 +442,7 @@ extern char *get_object_directory(void);
>  extern char *get_index_file(void);
>  extern char *get_graft_file(void);
>  extern int set_git_dir(const char *path);
> +extern int get_common_dir_noenv(struct strbuf *sb, const char *gitdir);
>  extern int get_common_dir(struct strbuf *sb, const char *gitdir);
>  extern const char *get_git_namespace(void);
>  extern const char *strip_namespace(const char *namespaced_ref);
> diff --git a/path.c b/path.c
> index 10f4cbf..b0cf444 100644
> --- a/path.c
> +++ b/path.c
> @@ -98,7 +98,7 @@ static const char *common_list[] = {
>         NULL
>  };
>
> -static void update_common_dir(struct strbuf *buf, int git_dir_len)
> +static void update_common_dir(struct strbuf *buf, int git_dir_len, const char *common_dir)
>  {
>         char *base = buf->buf + git_dir_len;
>         const char **p;
> @@ -115,12 +115,17 @@ static void update_common_dir(struct strbuf *buf, int git_dir_len)
>                         path++;
>                         is_dir = 1;
>                 }
> +
> +               if (!common_dir) {
> +                       common_dir = get_git_common_dir();
> +               }
Usually we omit the braces for blocks with just one command.
Show 103 quoted lines
> +
>                 if (is_dir && dir_prefix(base, path)) {
> -                       replace_dir(buf, git_dir_len, get_git_common_dir());
> +                       replace_dir(buf, git_dir_len, common_dir);
>                         return;
>                 }
>                 if (!is_dir && !strcmp(base, path)) {
> -                       replace_dir(buf, git_dir_len, get_git_common_dir());
> +                       replace_dir(buf, git_dir_len, common_dir);
>                         return;
>                 }
>         }
> @@ -160,7 +165,7 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)
>         else if (git_db_env && dir_prefix(base, "objects"))
>                 replace_dir(buf, git_dir_len + 7, get_object_directory());
>         else if (git_common_dir_env)
> -               update_common_dir(buf, git_dir_len);
> +               update_common_dir(buf, git_dir_len, NULL);
>  }
>
>  static void do_git_path(struct strbuf *buf, const char *fmt, va_list args)
> @@ -228,6 +233,8 @@ const char *git_path_submodule(const char *path, const char *fmt, ...)
>  {
>         struct strbuf *buf = get_pathname();
>         const char *git_dir;
> +       struct strbuf git_submodule_common_dir = STRBUF_INIT;
> +       struct strbuf git_submodule_dir = STRBUF_INIT;
>         va_list args;
>
>         strbuf_addstr(buf, path);
> @@ -241,11 +248,20 @@ const char *git_path_submodule(const char *path, const char *fmt, ...)
>                 strbuf_addstr(buf, git_dir);
>         }
>         strbuf_addch(buf, '/');
> +       strbuf_addstr(&git_submodule_dir, buf->buf);
>
>         va_start(args, fmt);
>         strbuf_vaddf(buf, fmt, args);
>         va_end(args);
> +
> +       if (get_common_dir_noenv(&git_submodule_common_dir, git_submodule_dir.buf)) {
> +               update_common_dir(buf, git_submodule_dir.len, git_submodule_common_dir.buf);
> +       }
> +
>         strbuf_cleanup_path(buf);
> +
> +       strbuf_release(&git_submodule_dir);
> +       strbuf_release(&git_submodule_common_dir);
>         return buf->buf;
>  }
>
> diff --git a/setup.c b/setup.c
> index 82c0cc2..39ea06b 100644
> --- a/setup.c
> +++ b/setup.c
> @@ -229,14 +229,21 @@ void verify_non_filename(const char *prefix, const char *arg)
>
>  int get_common_dir(struct strbuf *sb, const char *gitdir)
>  {
> +       const char *git_env_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT);
> +       if (git_env_common_dir) {
> +               strbuf_addstr(sb, git_env_common_dir);
> +               return 1;
> +       } else {
> +               return get_common_dir_noenv(sb, gitdir);
> +       }
> +}
> +
> +int get_common_dir_noenv(struct strbuf *sb, const char *gitdir)
> +{
>         struct strbuf data = STRBUF_INIT;
>         struct strbuf path = STRBUF_INIT;
> -       const char *git_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT);
>         int ret = 0;
> -       if (git_common_dir) {
> -               strbuf_addstr(sb, git_common_dir);
> -               return 1;
> -       }
> +
>         strbuf_addf(&path, "%s/commondir", gitdir);
>         if (file_exists(path.buf)) {
>                 if (strbuf_read_file(&data, path.buf, 0) <= 0)
> diff --git a/t/t7410-submodule-checkout-to.sh b/t/t7410-submodule-checkout-to.sh
> index 3f609e8..1acef32 100755
> --- a/t/t7410-submodule-checkout-to.sh
> +++ b/t/t7410-submodule-checkout-to.sh
> @@ -47,4 +47,14 @@ test_expect_success 'checkout main and initialize independed clones' \
>  test_expect_success 'can see submodule diffs after independed cloning' \
>      '(cd fully_cloned_submodule/main && git diff --submodule master"^!" | grep "file1 updated")'
>
> +test_expect_success 'checkout sub manually' \
> +    'mkdir linked_submodule &&
> +    (cd clone/main &&
> +       git worktree add "$base_path/linked_submodule/main" "$rev1_hash_main") &&
> +    (cd clone/main/sub &&
> +       git worktree add "$base_path/linked_submodule/main/sub" "$rev1_hash_sub")'
> +
> +test_expect_success 'can see submodule diffs after manual checkout of linked submodule' \
> +    '(cd linked_submodule/main && git diff --submodule master"^!" | grep "file1 updated")'
> +
>  test_done
> --
> 2.3.4.2801.g3d0809b
Looks good to me otherwise.
Show 5 quoted lines
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous: Max KirillovNext: Max Kirillov
Message 15 of 23 in “path: implement common_dir handling in git_path_submodule()”
  1. 0/2 path: implement common_dir handling in git_path_submodule()Max Kirillov, Mar 18, 2015
  2. 1/2 submodule refactor: use git_path_submodule() in add_submodule_odb()Max Kirillov, Mar 18, 2015
  3. 2/2 path: implement common_dir handling in git_path_submodule()Max Kirillov, Mar 18, 2015
  4. 0/2 path: implement common_dir handling in git_path_submodule()Max Kirillov, Aug 3, 2015
  5. 1/2 submodule refactor: use git_path_submodule() in add_submodule_odb()Max Kirillov, Aug 3, 2015
  6. Junio C HamanoAug 3, 2015
  7. 2/2 path: implement common_dir handling in git_path_submodule()Max Kirillov, Aug 3, 2015
  8. 0/2 path: implement common_dir handling in git_path_submodule()Max Kirillov, Aug 4, 2015
  9. 1/2 submodule refactor: use git_path_submodule() in add_submodule_odb()Max Kirillov, Aug 4, 2015
  10. 2/2 path: implement common_dir handling in git_path_submodule()Max Kirillov, Aug 4, 2015
  11. 0/2 path: implement common_dir handling in git_path_submodule()Max Kirillov, Aug 4, 2015
  12. 1/2 submodule refactor: use git_path_submodule() in add_submodule_odb()Max Kirillov, Aug 4, 2015
  13. Stefan BellerAug 18, 2015
  14. 2/2 path: implement common_dir handling in git_path_submodule()Max Kirillov, Aug 4, 2015
  15. Stefan BellerAug 17, 2015
  16. 0/2 Submodule object pathMax Kirillov, Sep 10, 2015
  17. 1/2 submodule refactor: use git_pathdup_submodule() in add_submodule_odb()Max Kirillov, Sep 10, 2015
  18. Jeff KingSep 11, 2015
  19. Max KirillovSep 13, 2015
  20. 2/2 path: implement common_dir handling in git_pathdup_submodule()Max Kirillov, Sep 10, 2015
  21. Junio C HamanoSep 11, 2015
  22. Max KirillovSep 13, 2015
  23. Junio C HamanoSep 14, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.