diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-12-15 08:10:09 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2012-12-15 08:10:09 -0500 |
| commit | 3f7909b6cb1b9e28a665fab0e7fe95377aed82b5 (patch) | |
| tree | c141c83d63362afcc63688732ca8bdd3feee0a67 | |
| parent | 3154f3c5bbc9f1e6aaf5fd4d869c7cfb5a6abb4e (diff) | |
| parent | bf0dc41362728f325269e5f04a416981d04f402c (diff) | |
| download | jgit-3f7909b6cb1b9e28a665fab0e7fe95377aed82b5.tar.gz jgit-3f7909b6cb1b9e28a665fab0e7fe95377aed82b5.zip | |
Merge "Fix hidden field warning" into stable-2.2
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java index 7a2d5de75e..963528d106 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java @@ -82,7 +82,7 @@ class Archive extends TextBuiltin { final ObjectReader reader = walk.getObjectReader(); final MutableObjectId idBuf = new MutableObjectId(); final Archiver fmt = formats.get(format); - final ArchiveOutputStream out = fmt.createArchiveOutputStream(outs); + final ArchiveOutputStream outa = fmt.createArchiveOutputStream(outs); if (tree == null) throw die(CLIText.get().treeIsRequired); @@ -100,10 +100,10 @@ class Archive extends TextBuiltin { continue; walk.getObjectId(idBuf, 0); - fmt.putEntry(name, mode, reader.open(idBuf), out); + fmt.putEntry(name, mode, reader.open(idBuf), outa); } - out.close(); + outa.close(); } static private void warnArchiveEntryModeIgnored(String name) { |