Fix NPE in remote/origin error message (#17 fixes #16)

Author: nedtwigg

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- When the remote branch was missing (as in a bare checkout), the user got an NPE rather than a nice error message. ([#16](https://github.com/diffplug/spotless-changelog/issues/16))
 
 ## [2.0.0] - 2020-06-16
 ### Changed

settings.gradle

@@ -1,26 +1,26 @@
 pluginManagement {
 	plugins {
-		id 'com.diffplug.blowdryer' version '1.0.0'
-		id 'com.diffplug.blowdryerSetup' version '1.0.0'
-		id 'com.diffplug.eclipse.mavencentral' version '3.22.0'
-		id 'com.diffplug.gradle.spotless' version '4.3.0'
+		id 'com.diffplug.blowdryer'          version '1.1.1'
+		id 'com.diffplug.blowdryerSetup'     version '1.1.1'
+		id 'com.diffplug.osgi.bndmanifest'   version '3.28.0'
 		id 'com.diffplug.spotless-changelog' version '2.0.0'
-		id 'com.gradle.plugin-publish' version '0.12.0'
-		id 'com.jfrog.bintray' version '1.8.5'
-		id 'org.jdrupes.mdoclet' version '1.0.10'
+		id 'com.diffplug.spotless'           version '5.10.1'
+		id 'com.gradle.plugin-publish'       version '0.13.0'
+		id 'com.jfrog.bintray'               version '1.8.5'
+		id 'org.jdrupes.mdoclet'             version '1.0.10'
 	}
 }
 plugins {
 	id 'com.diffplug.blowdryerSetup'
-	id 'com.diffplug.eclipse.mavencentral' apply false
-	id 'com.diffplug.gradle.spotless' apply false
+	id 'com.diffplug.osgi.bndmanifest'   apply false
+	id 'com.diffplug.spotless'           apply false
 	id 'com.diffplug.spotless-changelog' apply false
-	id 'com.gradle.plugin-publish' apply false
-	id 'com.jfrog.bintray' apply false
-	id 'org.jdrupes.mdoclet' apply false
+	id 'com.gradle.plugin-publish'       apply false
+	id 'com.jfrog.bintray'               apply false
+	id 'org.jdrupes.mdoclet'             apply false
 }
 blowdryerSetup {
-	github 'diffplug/blowdryer-diffplug', 'tag', '3.2.4'
+	github 'diffplug/blowdryer-diffplug', 'tag', '3.3.0'
 	//devLocal '../blowdryer-diffplug'
 }
 rootProject.name = 'spotless-changelog-agg'

spotless-changelog-lib/src/main/java/com/diffplug/spotless/changelog/GitActions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 DiffPlug
+ * Copyright (C) 2019-2021 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ public void checkCanPush() throws GitAPIException, IOException {
 			Ref ref = repository.getRefDatabase().exactRef(Constants.R_HEADS + cfg.branch);
 			Objects.requireNonNull(ref, "Expected ref " + Constants.R_HEADS + cfg.branch);
 			Ref remoteRef = repository.getRefDatabase().exactRef(Constants.R_REMOTES + cfg.remote + "/" + cfg.branch);
-			Objects.requireNonNull(ref, "Expected ref " + Constants.R_REMOTES + cfg.remote + "/" + cfg.branch);
+			Objects.requireNonNull(remoteRef, "Expected ref " + Constants.R_REMOTES + cfg.remote + "/" + cfg.branch);
 			if (!ref.getObjectId().equals(remoteRef.getObjectId())) {
 				throw new IllegalStateException("Local branch " + cfg.branch + " is out of sync with " + cfg.remote + ", so we can't safely push it automatically.");
 			}