git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johan Herland <johan@herland.net>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: git@vger.kernel.org, gitster@pobox.com, jens.lehmann@web.de
Subject: Re: [PATCH v2 0/4] implement automatic submodule merge strategy when possible
Date: Wed, 07 Jul 2010 01:53:04 +0200	[thread overview]
Message-ID: <201007070153.05684.johan@herland.net> (raw)
In-Reply-To: <cover.1278444110.git.hvoigt@hvoigt.net>

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, <johan@herland.net>
www.herland.net

      parent reply	other threads:[~2010-07-06 23:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-06 19:34 [PATCH v2 0/4] implement automatic submodule merge strategy when possible Heiko Voigt
2010-07-06 19:34 ` [PATCH v2 1/4] add missing && to submodule-merge testcase Heiko Voigt
2010-07-06 19:34 ` [PATCH v2 2/4] teach ref iteration module about submodules Heiko Voigt
2010-07-06 19:34 ` [PATCH v2 3/4] extent setup_revisions() so it works with submodules Heiko Voigt
2010-07-07  5:28   ` Junio C Hamano
2010-07-07 13:37     ` Heiko Voigt
2010-07-06 19:34 ` [PATCH v2 4/4] implement automatic fast forward merge for submodules Heiko Voigt
2010-07-06 23:52   ` Johan Herland
2010-07-07 13:35     ` Heiko Voigt
2010-07-08  0:34       ` Junio C Hamano
2010-07-06 23:53 ` Johan Herland [this message]

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=201007070153.05684.johan@herland.net \
    --to=johan@herland.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hvoigt@hvoigt.net \
    --cc=jens.lehmann@web.de \
    /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).