motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Fix hidden field warning" into stable-2.2

This commit is contained in:
Robin Rosenberg 2012-12-15 08:10:09 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 3154f3c5bb bf0dc41362
commit 3f7909b6cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java
View File

@ -82,7 +82,7 @@ protected void run() throws Exception {
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 @@ protected void run() throws Exception {
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) {