Re: [PATCH] Fixes to packed delta format reading.

From: Shawn Pearce <spearce@spearce.org>
Date: Aug 7, 2006, 04:03 UTC
Message-ID: <20060807040342.GA20514@spearce.org>
In-Reply-To: <20060806184038.7591.12898.stgit@lathund.dewire.com>

Show 27 quoted lines

> ---
> 
>  .../src/org/spearce/jgit/lib/PatchDeltaStream.java |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PatchDeltaStream.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PatchDeltaStream.java
> index 808e854..11a7679 100644
> --- a/org.spearce.jgit/src/org/spearce/jgit/lib/PatchDeltaStream.java
> +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PatchDeltaStream.java
> @@ -105,7 +105,7 @@ public class PatchDeltaStream extends In
>                              + " load delta base for patching.");
>                      }
>                      shift += n;
> -                    expBaseLen += n;
> +                    expBaseLen -= n;
>                  }
>              }
>              finally
> @@ -269,7 +269,7 @@ public class PatchDeltaStream extends In
>          throws IOException
>      {
>          int r;
> -        while ((r = read(buf, o, len)) > 0)
> +        while ((r = deltaStream.read(buf, o, len)) > 0)
>          {
>              o += r;
>              len -= r;

Thanks. I actually found these Friday night when I started reviewing the code to double check its compliance with A Large Angry SCM's file format documentation. These were already made locally but I didn't push them out to my web repository yet. I'll do that shortly.

-- 
Shawn.