opendev/gerrit
Code Issues Proposed changes

Update JGit to 0.11.3.113-ga490afe

Browse Source 
Change-Id: Ia89bdd8eebddf1bb060edfb4cf6a398a445197a6
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2011-03-11 17:21:01 -08:00
parent 0ff5ff0112
commit 701c5f67f8
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
View File

@@ -313,7 +313,7 @@ class PushOp implements ProjectRunnable {
if (dst == null || !src.getObjectId().equals(dst.getObjectId())) {
// Doesn't exist yet, or isn't the same value, request to push.
//
send(cmds, spec);
send(cmds, spec, src);
}
}
}
@@ -335,8 +335,9 @@ class PushOp implements ProjectRunnable {
if (spec != null) {
// If the ref still exists locally, send it, otherwise delete it.
//
if (local.containsKey(src)) {
send(cmds, spec);
Ref srcRef = local.get(src);
if (srcRef != null) {
send(cmds, spec, srcRef);
} else {
delete(cmds, spec);
}
@@ -375,9 +376,8 @@ class PushOp implements ProjectRunnable {
return null;
}
private void send(final List<RemoteRefUpdate> cmds, final RefSpec spec)
throws IOException {
final String src = spec.getSource();
private void send(final List<RemoteRefUpdate> cmds, final RefSpec spec,
final Ref src) throws IOException {
final String dst = spec.getDestination();
final boolean force = spec.isForceUpdate();
cmds.add(new RemoteRefUpdate(db, src, dst, force, null, null));
@@ -387,7 +387,7 @@ class PushOp implements ProjectRunnable {
throws IOException {
final String dst = spec.getDestination();
final boolean force = spec.isForceUpdate();
cmds.add(new RemoteRefUpdate(db, null, dst, force, null, null));
cmds.add(new RemoteRefUpdate(db, (Ref) null, dst, force, null, null));
}
@Override