Re: [JGIT PATCH 09/19] Refactor Config hierarchy to make IO more explicit
Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:
Show 26 quoted lines
> s?ndag 26 juli 2009 00:55:04 skrev "Shawn O. Pearce" <spearce@spearce.org>:
> > Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:
> > >
> > > This one does not apply for the Config class here.
> >
> > Did you apply with --whitespace=strip or something and fall afoul
> > of a merge conflict due to changed context?
>
> Config.java looks (partially) like this:
>
> --------------------------
> import java.util.Map;
> import java.util.Set;
>
> /**
>
> ----------------------------
>
> and the patch looks (partially again) like this:
>
> @@ -55,19 +49,18 @@
> import java.util.Map;
> import java.util.Set;
>
> +import org.spearce.jgit.errors.ConfigInvalidException;
> import org.spearce.jgit.util.StringUtils;
You missed the patch where I added StringUtils. See "[PATCH]
Ensure Config readers handle case insensitive names correctly"
from Friday Jul 24.
--
Shawn.