From 0d5334747111b4ce90aa120b37f1c8ae632fbda6 Mon Sep 17 00:00:00 2001 From: Marek Zawirski Date: Thu, 28 Aug 2008 04:06:59 +0200 Subject: [PATCH] Fix push's RemoteRefUpdate to always force update local TrackingRefUpdate Now, we force update local tracking ref even if we do not force remote ref update. It seems to be sensible approach (C git one) assuming that our repository may be out of sync with the remote one. The potentially lost information here isn't so valuable perhaps. Signed-off-by: Marek Zawirski --- org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java b/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java index fd193000..623599f6 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/RemoteRefUpdate.java @@ -189,7 +189,7 @@ public class RemoteRefUpdate { this.forceUpdate = forceUpdate; if (localName != null && localDb != null) trackingRefUpdate = new TrackingRefUpdate(localDb, localName, - remoteName, forceUpdate, newObjectId, "push"); + remoteName, true, newObjectId, "push"); else trackingRefUpdate = null; this.localDb = localDb; -- 2.11.4.GIT