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

Re: [PATCH v8 0/2] Submodule object path

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 14, 2015, 18:14 UTC
Message-ID
<xmqqk2rsx404.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20150913223256.GB8042@wheezy.local>
Max Kirillov <max@max630.net> writes:
Show 5 quoted lines
> On Thu, Sep 10, 2015 at 06:10:13PM -0700, Junio C Hamano wrote:
>> When I push the updated 'pu' out, could you please check
>
> I follow the pu merges. So far resolutions seem correct and
> all tests pass.

The primary thing I ask from "eyeballing by the original author" is to see if "git diff M^ M" for the merge M of the topic is something the original author would have done if he was given a starting point of M^ to build his or her topic (which is what your "resolutions seem correct" really is), so we are good.

> If you don't mind re-resolving it as I send newer versions I will
> base them on master.

So far rerere seems to be happy, so basing on the same commit is fine, but I suspect this round should already be ready for 'next'.

I had to remove the now-unused variable "const char *git_dir;" in [PATCH 1/2], but other than that it looked OK from a cursory re-read.

Thanks.
Previous: Max Kirillov
Message 23 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.