Skip to content

Commit 56fcaa5

Browse files
authored
Merge pull request #612 from diffplug/feat/ratchet-fix
Fix GitRatchet for the case where a non-existent reference is specified.
2 parents 58931b3 + 63a4950 commit 56fcaa5

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

plugin-gradle/CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1010
* Bumped default versions, prettier `1.16.4` -> `2.0.5`, tslint `5.12.1` -> `6.1.2`
1111
### Fixed
1212
* Using `ratchetFrom 'origin/main'` on a bare checkout generated a cryptic error, now generates a clear error. ([#608](https://github.com/diffplug/spotless/issues/608))
13+
* Using `ratchetFrom 'nonexistent-reference` generated a cryptic error, now generates a clear error. ([#612](https://github.com/diffplug/spotless/issues/612))
1314

1415
## [4.3.0] - 2020-06-05
1516
### Deprecated

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GitRatchet.java

+3
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ public synchronized ObjectId rootTreeShaOf(Project project, String reference) {
186186
ObjectId treeSha = rootTreeShaCache.get(repo, reference);
187187
if (treeSha == null) {
188188
ObjectId commitSha = repo.resolve(reference);
189+
if (commitSha == null) {
190+
throw new IllegalArgumentException("No such reference '" + reference + "'");
191+
}
189192
try (RevWalk revWalk = new RevWalk(repo)) {
190193
RevCommit revCommit = revWalk.parseCommit(commitSha);
191194
treeSha = revCommit.getTree();

0 commit comments

Comments
 (0)