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

2015-09-14 Thread Junio C Hamano
Max Kirillov writes: > 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

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

2015-09-13 Thread Max Kirillov
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. If you don't mind re-resolving it as I send newer versions I will base them on master. Thank you.

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

2015-09-10 Thread Junio C Hamano
Max Kirillov writes: > * There are more conflicts in pu with [1], not sure > what should I do about it. > > [1] http://thread.gmane.org/gmane.comp.version-control.git/276628 I do not think conflicts got any worse than before. Between the result of merging this round and the previous one to 'p

[PATCH v8 0/2] Submodule object path

2015-09-10 Thread Max Kirillov
* Rebased to recent master (v2.6.0-rc0). * Use git_pathdup_submodule() instead of git_path_submodule() * There are more conflicts in pu with [1], not sure what should I do about it. * Style fixes as Stefan suggested [1] http://thread.gmane.org/gmane.comp.version-control.git/276628 Max Kirillov