threads / patch / 18174

patch[JGit] Fix parsing peeled line in packed-ref

Subject: [PATCH] [JGit] Fix parsing peeled line in packed-ref

## tl;dr

2 messages between Mar 6, 2009 and Mar 6, 2009. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Daniel Cheng (aka SDiZ)· Mar 6, 2009, 15:25 UTC · lore

When doing a WalkTransport with packed-ref, peeled
line are not handled correctly. This patch fix the
issue.
---
 .../jgit/transport/WalkRemoteObjectDatabase.java   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java +1 −1

diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java
index a4f8961..d8e727b 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java
@@ -436,7 +436,7 @@ private void readPackedRefsImpl(final Map<String, Ref> avail,
 			if (line.charAt(0) == '^') {
 				if (last == null)
 					throw new TransportException("Peeled line before ref.");
-				final ObjectId id = ObjectId.fromString(line + 1);
+				final ObjectId id = ObjectId.fromString(line.substring(1));
 				last = new Ref(Ref.Storage.PACKED, last.getName(), last
 						.getObjectId(), id, true);
 				avail.put(last.getName(), last);

-- 
1.6.2.rc2

Shawn O. Pearce· Mar 6, 2009, 15:43 UTC · re: Daniel Cheng (aka SDiZ) · lore

Re: [PATCH] [JGit] Fix parsing peeled line in packed-ref

"Daniel Cheng (aka SDiZ)" <j16sdiz+freenet@gmail.com> wrote:

> When doing a WalkTransport with packed-ref, peeled
> line are not handled correctly. This patch fix the
> issue.

Wow.  That old code was really wrong.  :-)

Signed-off-by?  (See SUBMITTING_PATCHES, "(5) Sign your work")

Show 11 quoted lines

> diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java
> index a4f8961..d8e727b 100644
> --- a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java
> +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkRemoteObjectDatabase.java
> @@ -436,7 +436,7 @@ private void readPackedRefsImpl(final Map<String, Ref> avail,
>  			if (line.charAt(0) == '^') {
>  				if (last == null)
>  					throw new TransportException("Peeled line before ref.");
> -				final ObjectId id = ObjectId.fromString(line + 1);
> +				final ObjectId id = ObjectId.fromString(line.substring(1));
>  				last = new Ref(Ref.Storage.PACKED, last.getName(), last

If I'm at fault for that preimage, I should just be put out to pasture now... before I do any more harm... *sigh*

-- 
Shawn.