Re: [PATCH v2 0/4] implement automatic submodule merge strategy when possible

On Tuesday 06 July 2010, Heiko Voigt wrote:

Changes since the previous iteration:

 * Add missing option --ancestry-path to setup_revisions()
 * Drop unnecessary caching of submodule refs
 * Use buf.len instead of NUL-padding for path buffer in
   git_path_submodule()
 * Extend the testcases so they will check for the correct suggestion
   output in case of a failed merge.
 * cleanup of some comments


Heiko Voigt (4):
  add missing && to submodule-merge testcase
  teach ref iteration module about submodules
  extent setup_revisions() so it works with submodules
  implement automatic fast forward merge for submodules

I've quickly looked through the patches, and the general logic seems good. 
There are a few typos and other small issues to fix, though:

Patch #3:

- commit message: s/extent/Extend/ and s/so it works/to work/

Patch #4:

(see separate email)


Thanks for the effort.


Have fun! :)

...Johan

-- 
Johan Herland, [off-list ref]
www.herland.net