github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge "Fix hidden field warning" into stable-2.2

stable-2.2
Robin Rosenberg 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
3154f3c5bb bf0dc41362
commit
3f7909b6cb
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java

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

@ -82,7 +82,7 @@ class Archive extends TextBuiltin {
final ObjectReader reader = walk.getObjectReader(); final ObjectReader reader = walk.getObjectReader();
final MutableObjectId idBuf = new MutableObjectId(); final MutableObjectId idBuf = new MutableObjectId();
final Archiver fmt = formats.get(format); final Archiver fmt = formats.get(format);
final ArchiveOutputStream out = fmt.createArchiveOutputStream(outs); final ArchiveOutputStream outa = fmt.createArchiveOutputStream(outs);
if (tree == null) if (tree == null)
throw die(CLIText.get().treeIsRequired); throw die(CLIText.get().treeIsRequired);
@ -100,10 +100,10 @@ class Archive extends TextBuiltin {
continue; continue;
walk.getObjectId(idBuf, 0); 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) { static private void warnArchiveEntryModeIgnored(String name) {

Write Preview
Loading…
Cancel
Save