Re: [EGIT PATCH 2/4] Use the Git sort order.

From: Shawn O. Pearce <spearce@spearce.org>
Date: Apr 24, 2007, 17:09 UTC
Message-ID: <20070424170918.GA5923@spearce.org>
In-Reply-To: <200704240039.48892.robin.rosenberg.lists@dewire.com>

Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:

> Oops, lost the decoration here.

Thanks, I applied all 6 patches.  Good stuff.

Unfortunately this particular patch was totally damaged beyond repair. What happened to it? I redid the changes by hand, as even after fixing the line wrapping on the `diff --git` header line `git-am -3 --whitespace=strip` was unable to apply the patch to 0c4683e. The patch doesn't apply, at all, to that blob.

Show 28 quoted lines

> diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java b/org.spearce.egit.core/src/org/spearce/egit
> /core/project/GitProjectData.java
> index 0c4683e..5c250c0 100644
> --- a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
> +++ b/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
> @@ -274,11 +274,11 @@ public class GitProjectData {
>                 return (RepositoryMapping) c2mapping.get(r);
>         }
> 
> -       public TreeEntry[] getActiveDiffTreeEntries(IResource r)
> +       public TreeEntry[] getActiveDiffTreeEntries(IResource res)
>                         throws CoreException {
>                 String s = null;
>                 RepositoryMapping m = null;
> -
> +               IResource r = res;
>                 while (r != null) {
>                         m = getRepositoryMapping(r);
>                         if (m != null) {
> @@ -296,7 +296,7 @@ public class GitProjectData {
> 
>                 if (s != null && m != null && m.getActiveDiff() != null) {
>                         try {
> -                               if (r.getType() == IResource.FILE)
> +                               if (res.getType() == IResource.FILE)
>                                         return m.getActiveDiff().findBlobMember(s);
>                                 else
>                                         return m.getActiveDiff().findTreeMember(s);

-- 
Shawn.