From 9e3fa80919b85f83b02dbe976e116fe25333a2f0 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Thu, 3 Sep 2015 11:02:35 -0400 Subject: [PATCH] UploadArchive: Correct check for tree-ish not found Repository#resolve(String) returns null, not zeroId, if it couldn't resolve. Coverity-CID: 80898 Change-Id: I29e20c94cb4848241a06e41d78f033e06ae84eba --- .../java/com/google/gerrit/sshd/commands/UploadArchive.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java index 379ee4bae7..c3dae3ae84 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java @@ -162,7 +162,7 @@ public class UploadArchive extends AbstractGitCommand { // Find out the object to get from the specified reference and paths ObjectId treeId = repo.resolve(options.treeIsh); - if (treeId.equals(ObjectId.zeroId())) { + if (treeId == null) { throw new Failure(4, "fatal: reference not found"); }