diff options
| author | Edwin Kempin <edwin.kempin@gmail.com> | 2013-01-09 02:53:00 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-09 02:53:00 -0800 |
| commit | b9d83fcb9bf72cf9b7cabfc9197ace95f38446e8 (patch) | |
| tree | f53dba2b0359460784530319bdccaf19fd3a2abf | |
| parent | 928a29657a0c122ce6e3fdc32f83b3a8f5bed8e3 (diff) | |
Revert "Create ref for new patch set on direct push"
This reverts commit 928a29657a0c122ce6e3fdc32f83b3a8f5bed8e3
It turned out that this breaks uploading of new patch sets for review
since in this case the change ref is already created and trying to
create it again fails.
Change-Id: Icb3678d19bf10201a3731f3f534942fa064416e2
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 68f5752b3b..7d1a33a633 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -82,7 +82,6 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Ref; -import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.notes.NoteMap; import org.eclipse.jgit.revwalk.FooterKey; @@ -1697,14 +1696,7 @@ public class ReceiveCommits { markChangeMergedByPush(db, this); } - final RefUpdate ru = repo.updateRef(newPatchSet.getRefName()); - ru.setNewObjectId(newCommit); - ru.disableRefLog(); - if (ru.update(rp.getRevWalk()) != RefUpdate.Result.NEW) { - throw new IOException("Failed to create ref " + newPatchSet.getRefName() + " in " - + repo.getDirectory() + ": " + ru.getResult()); - } - replication.fire(project.getNameKey(), ru.getName()); + replication.fire(project.getNameKey(), newPatchSet.getRefName()); hooks.doPatchsetCreatedHook(change, newPatchSet, db); replaceProgress.update(1); if (mergedIntoRef != null) { |