]> source.dussan.org Git - jgit.git/commitdiff
pgm: Fix missing braces in Diff.run() 22/135422/1
authorMatthias Sohn <matthias.sohn@sap.com>
Sun, 20 Jan 2019 20:07:28 +0000 (21:07 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Sun, 20 Jan 2019 21:18:40 +0000 (22:18 +0100)
Change-Id: I326b85f49d9b2f3c753f8a38e3f65ee61ba35db3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java

index d53125d8c0215cd2724e2fc0a183ea92c105e6ae..a86e8dddcaee913c9c7264c82e5eb16588224dd6 100644 (file)
@@ -184,8 +184,9 @@ class Diff extends TextBuiltin {
                        if (cached) {
                                if (oldTree == null) {
                                        ObjectId head = db.resolve(HEAD + "^{tree}"); //$NON-NLS-1$
-                                       if (head == null)
+                                       if (head == null) {
                                                die(MessageFormat.format(CLIText.get().notATree, HEAD));
+                                       }
                                        CanonicalTreeParser p = new CanonicalTreeParser();
                                        try (ObjectReader reader = db.newObjectReader()) {
                                                p.reset(reader, head);
@@ -196,15 +197,17 @@ class Diff extends TextBuiltin {
                        } else if (oldTree == null) {
                                oldTree = new DirCacheIterator(db.readDirCache());
                                newTree = new FileTreeIterator(db);
-                       } else if (newTree == null)
+                       } else if (newTree == null) {
                                newTree = new FileTreeIterator(db);
+                       }
 
                        TextProgressMonitor pm = new TextProgressMonitor(errw);
                        pm.setDelayStart(2, TimeUnit.SECONDS);
                        diffFmt.setProgressMonitor(pm);
                        diffFmt.setPathFilter(pathFilter);
-                       if (detectRenames != null)
+                       if (detectRenames != null) {
                                diffFmt.setDetectRenames(detectRenames.booleanValue());
+                       }
                        if (renameLimit != null && diffFmt.isDetectRenames()) {
                                RenameDetector rd = diffFmt.getRenameDetector();
                                rd.setRenameLimit(renameLimit.intValue());
@@ -213,7 +216,6 @@ class Diff extends TextBuiltin {
                        if (showNameAndStatusOnly) {
                                nameStatus(outw, diffFmt.scan(oldTree, newTree));
                                outw.flush();
-
                        } else {
                                diffFmt.format(oldTree, newTree);
                                diffFmt.flush();