From 95b36b397b528f858ef1559da3c33c6cf3d7117b Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Sat, 28 Nov 2015 00:15:36 +0100 Subject: Null-annotated Ref class and fixed related compiler errors This change fixes all compiler errors in JGit and replaces possible NPE's with either appropriate exceptions, avoiding multiple "Nullable return" method calls or early returning from the method. Change-Id: I24c8a600ec962d61d5f40abf73eac4203e115240 Signed-off-by: Andrey Loskutov --- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java') diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index cd65af9549..e739b58ae7 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -148,9 +148,12 @@ class Merge extends TextBuiltin { break; case FAST_FORWARD: ObjectId oldHeadId = oldHead.getObjectId(); - outw.println(MessageFormat.format(CLIText.get().updating, oldHeadId - .abbreviate(7).name(), result.getNewHead().abbreviate(7) - .name())); + if (oldHeadId != null) { + String oldId = oldHeadId.abbreviate(7).name(); + String newId = result.getNewHead().abbreviate(7).name(); + outw.println(MessageFormat.format(CLIText.get().updating, oldId, + newId)); + } outw.println(result.getMergeStatus().toString()); break; case CHECKOUT_CONFLICT: -- cgit v1.2.3