Merge "Revert "Set CommitInfo.commit in ChangeJson#toCommit""
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index 2837155..48ed355 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -389,7 +389,6 @@
}
},
"commit": {
- "commit": "184ebe53805e102605d11f6b143486d15c23a09c",
"parents": [
{
"commit": "1eee2c9d8f352483781e772f35dc586a69ff5646",
@@ -948,28 +947,26 @@
}
},
"commit": {
- "commit": "27cc4558b5a3d3387dd11ee2df7a117e7e581822",
"parents": [
{
"commit": "b4003890dadd406d80222bf1ad8aca09a4876b70",
"subject": "Implement Feature A"
}
- ],
- "author": {
- "name": "John Doe",
- "email": "john.doe@example.com",
- "date": "2013-05-07 15:21:27.000000000",
- "tz": 120
- },
- "committer": {
- "name": "Gerrit Code Review",
- "email": "gerrit-server@example.com",
- "date": "2013-05-07 15:35:43.000000000",
- "tz": 120
- },
- "subject": "Implement Feature X",
- "message": "Implement Feature X\n\nAdded feature X."
- }
+ ],
+ "author": {
+ "name": "John Doe",
+ "email": "john.doe@example.com",
+ "date": "2013-05-07 15:21:27.000000000",
+ "tz": 120
+ },
+ "committer": {
+ "name": "Gerrit Code Review",
+ "email": "gerrit-server@example.com",
+ "date": "2013-05-07 15:35:43.000000000",
+ "tz": 120
+ },
+ "subject": "Implement Feature X",
+ "message": "Implement Feature X\n\nAdded feature X."
}
}
}
@@ -1328,7 +1325,6 @@
"ref": "refs/changes/79/1779/1",
"fetch": {},
"commit": {
- "commit": "9adb9f4c7b40eeee0646e235de818d09164d7379",
"parents": [
{
"commit": "2d3176497a2747faed075f163707e57d9f961a1c",
@@ -1448,7 +1444,6 @@
"ref": "refs/changes/80/1780/1",
"fetch": {},
"commit": {
- "commit": "1bd7c12a38854a2c6de426feec28800623f492c4",
"parents": [
{
"commit": "9adb9f4c7b40eeee0646e235de818d09164d7379",
@@ -2886,28 +2881,26 @@
}
},
"commit": {
- "commit": "27cc4558b5a3d3387dd11ee2df7a117e7e581822",
"parents": [
{
"commit": "b4003890dadd406d80222bf1ad8aca09a4876b70",
"subject": "Implement Feature A"
}
- ],
- "author": {
- "name": "John Doe",
- "email": "john.doe@example.com",
- "date": "2013-05-07 15:21:27.000000000",
- "tz": 120
- },
- "committer": {
- "name": "Gerrit Code Review",
- "email": "gerrit-server@example.com",
- "date": "2013-05-07 15:35:43.000000000",
- "tz": 120
- },
- "subject": "Implement Feature X",
- "message": "Implement Feature X\n\nAdded feature X."
- }
+ ],
+ "author": {
+ "name": "John Doe",
+ "email": "john.doe@example.com",
+ "date": "2013-05-07 15:21:27.000000000",
+ "tz": 120
+ },
+ "committer": {
+ "name": "Gerrit Code Review",
+ "email": "gerrit-server@example.com",
+ "date": "2013-05-07 15:35:43.000000000",
+ "tz": 120
+ },
+ "subject": "Implement Feature X",
+ "message": "Implement Feature X\n\nAdded feature X."
}
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
index 5033f6f..ec145d5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
@@ -1013,11 +1013,6 @@
boolean addLinks) throws IOException {
Project.NameKey project = ctl.getProject().getNameKey();
CommitInfo info = new CommitInfo();
-
- // TODO(fishywang): this is redundant with the map key, find a better way to provide the SHA-1
- // for RevisionEvent.
- info.commit = commit.name();
-
info.parents = new ArrayList<>(commit.getParentCount());
info.author = toGitPerson(commit.getAuthorIdent());
info.committer = toGitPerson(commit.getCommitterIdent());
