Merge branch 'stable-2.7'
* stable-2.7:
Correct example of export command usage in documentation
Conflicts:
pom.xml
Change-Id: I1416a3e004d3fb97d6d6f472c7da4def3e12b4fa
diff --git a/BUCK b/BUCK
new file mode 100644
index 0000000..9b7fa54
--- /dev/null
+++ b/BUCK
@@ -0,0 +1,9 @@
+gerrit_plugin(
+ name = 'reviewnotes',
+ srcs = glob(['src/main/java/**/*.java']),
+ resources = glob(['src/main/resources/**/*']),
+ manifest_entries = [
+ 'Gerrit-Module: com.googlesource.gerrit.plugins.reviewnotes.ReviewNotesModule',
+ 'Gerrit-SshModule: com.googlesource.gerrit.plugins.reviewnotes.SshModule'
+ ]
+)
diff --git a/pom.xml b/pom.xml
index 568246e..ba5ac6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>com.googlesource.gerrit.plugins.reviewnotes</groupId>
<artifactId>reviewnotes</artifactId>
<packaging>jar</packaging>
- <version>2.7</version>
+ <version>2.8-SNAPSHOT</version>
<name>reviewnotes</name>
<properties>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
index 63d9186..523c5b6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
@@ -117,6 +117,10 @@
void createNotes(String branch, ObjectId oldObjectId, ObjectId newObjectId,
ProgressMonitor monitor) throws OrmException, IOException {
+ if (ObjectId.zeroId().equals(newObjectId)) {
+ return;
+ }
+
RevWalk rw = new RevWalk(git);
try {
rw.markStart(rw.parseCommit(newObjectId));
@@ -224,7 +228,7 @@
+ " more than one patch set found for the commit " + c.name());
return null;
}
- return getInseter().insert(Constants.OBJ_BLOB, fmt.toString().getBytes("UTF-8"));
+ return getInserter().insert(Constants.OBJ_BLOB, fmt.toString().getBytes("UTF-8"));
}
private void createCodeReviewNote(PatchSet ps, HeaderFormatter fmt)
@@ -265,7 +269,7 @@
fmt.appendBranch(change.getDest().get());
}
- private ObjectInserter getInseter() {
+ private ObjectInserter getInserter() {
if (inserter == null) {
inserter = git.newObjectInserter();
}
diff --git a/src/main/resources/Documentation/about.md b/src/main/resources/Documentation/about.md
new file mode 100644
index 0000000..ded934b
--- /dev/null
+++ b/src/main/resources/Documentation/about.md
@@ -0,0 +1,3 @@
+Stores review information for Gerrit changes in the refs/notes/review
+branch.
+
