commit b83ee444b1e808cd1426cb01e5a7bc1bcb65a5e2
author Kenny Ho <y2kenny@gmail.com> Mon Oct 24 15:31:51 2016 -0400
committer Kenny Ho <y2kenny@gmail.com> Wed Oct 26 17:38:02 2016 -0400
tree aa92ed6513ed5392a4c6bb664656e9d65d9479f8
parent aa1f51edfac9af9fdd8508fe737465c22e6f9531

Do not set project upstream if it's a git hash

Otherwise 'repo sync' will break when using -c option

Change-Id: Id9f3c9d215fe84bf5cb25a33cec2e2c221810bf9

src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java

diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java
index 0e87269..bdffd8c 100644
--- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java
+++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java
@@ -14,17 +14,20 @@
 
 package com.amd.gerrit.plugins.manifestsubscription;
 
-import com.amd.gerrit.plugins.manifestsubscription.manifest.Manifest;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Table;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.VersionedMetaData;
+
+import com.amd.gerrit.plugins.manifestsubscription.manifest.Manifest;
+
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.lib.CommitBuilder;
+import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -34,18 +37,25 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.*;
 
 public class VersionedManifests extends VersionedMetaData implements ManifestProvider {
   private static final Logger log =
       LoggerFactory.getLogger(VersionedManifests.class);
+
   private String refName;
   private Unmarshaller manifestUnmarshaller;
   private Marshaller manifestMarshaller;
@@ -295,7 +305,9 @@
                            String hash, String name,
                            GitRepositoryManager gitRepoManager) {
         project.setRevision(hash);
-        project.setUpstream(name);
+        if (!ObjectId.isId(name)) {
+          project.setUpstream(name);
+        }
         return true;
       }
     };