* [PATCH] [JGit] Fix parsing peeled line in packed-ref
@ 2009-03-06 15:26 Daniel Cheng (aka SDiZ)
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Cheng (aka SDiZ) @ 2009-03-06 15:26 UTC (permalink / raw)
To: git; +Cc: Daniel Cheng (aka SDiZ)
From: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@sdiz.net>
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH JGIT] Fix parsing peeled line in packed-ref
@ 2009-03-06 16:05 Daniel Cheng (aka SDiZ)
2009-03-06 16:19 ` Shawn O. Pearce
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Cheng (aka SDiZ) @ 2009-03-06 16:05 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Daniel Cheng (aka SDiZ), Daniel Cheng (aka SDiZ)
From: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@sdiz.net>
When doing a WalkTransport with packed-ref, peeled
line are not handled correctly. This patch fix the issue.
Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com>
---
.../jgit/transport/WalkRemoteObjectDatabase.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH JGIT] Fix parsing peeled line in packed-ref
2009-03-06 16:05 [PATCH JGIT] " Daniel Cheng (aka SDiZ)
@ 2009-03-06 16:19 ` Shawn O. Pearce
0 siblings, 0 replies; 5+ messages in thread
From: Shawn O. Pearce @ 2009-03-06 16:19 UTC (permalink / raw)
To: Daniel Cheng (aka SDiZ); +Cc: git, Daniel Cheng (aka SDiZ)
"Daniel Cheng (aka SDiZ)" <j16sdiz+freenet@gmail.com> wrote:
> From: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@sdiz.net>
>
> When doing a WalkTransport with packed-ref, peeled
> line are not handled correctly. This patch fix the issue.
>
> Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com>
Thanks. Fix pushed.
--
Shawn.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] [JGit] Fix parsing peeled line in packed-ref
@ 2009-03-06 15:25 Daniel Cheng (aka SDiZ)
2009-03-06 15:43 ` Shawn O. Pearce
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Cheng (aka SDiZ) @ 2009-03-06 15:25 UTC (permalink / raw)
To: git; +Cc: Daniel Cheng (aka SDiZ)
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] [JGit] Fix parsing peeled line in packed-ref
2009-03-06 15:25 [PATCH] [JGit] " Daniel Cheng (aka SDiZ)
@ 2009-03-06 15:43 ` Shawn O. Pearce
0 siblings, 0 replies; 5+ messages in thread
From: Shawn O. Pearce @ 2009-03-06 15:43 UTC (permalink / raw)
To: Daniel Cheng (aka SDiZ); +Cc: git, Daniel Cheng (aka SDiZ)
"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")
> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-03-06 16:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-06 15:26 [PATCH] [JGit] Fix parsing peeled line in packed-ref Daniel Cheng (aka SDiZ)
-- strict thread matches above, loose matches on Subject: below --
2009-03-06 16:05 [PATCH JGIT] " Daniel Cheng (aka SDiZ)
2009-03-06 16:19 ` Shawn O. Pearce
2009-03-06 15:25 [PATCH] [JGit] " Daniel Cheng (aka SDiZ)
2009-03-06 15:43 ` Shawn O. Pearce
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 NNTP newsgroup(s).