From a1a5218032a8f068fd0ee62d56acdb6251404583 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Wed, 12 Mar 2014 16:44:59 -0700 Subject: [PATCH] Default receive.fsckObjects to transfer.fsckObjects ReceivePack should configure itself with receive.fsckObjects, and if not defined, transfer.fsckObjects. This is the order used by git-core. Change-Id: I41f243633dacb606dbcc3132972f63bbaba174d1 --- .../src/org/eclipse/jgit/transport/BaseReceivePack.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java index 483ac55fa..0c83ece29 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java @@ -284,8 +284,9 @@ public abstract class BaseReceivePack { final boolean allowOfsDelta; ReceiveConfig(final Config config) { - checkReceivedObjects = config.getBoolean("receive", "fsckobjects", //$NON-NLS-1$ //$NON-NLS-2$ - false); + checkReceivedObjects = config.getBoolean( + "receive", "fsckobjects", //$NON-NLS-1$ //$NON-NLS-2$ + config.getBoolean("transfer", "fsckobjects", false)); //$NON-NLS-1$ //$NON-NLS-2$ allowCreates = true; allowDeletes = !config.getBoolean("receive", "denydeletes", false); //$NON-NLS-1$ //$NON-NLS-2$ allowNonFastForwards = !config.getBoolean("receive", //$NON-NLS-1$