From: Shawn Pearce <spearce@spearce.org>
Date: Wed, 12 Mar 2014 23:53:26 +0000 (-0700)
Subject: Correct fetch to use fetch.fsckObjects and transfer.fsckObjects
X-Git-Tag: v3.4.0.201405051725-m7~51^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F23289%2F2;p=jgit.git

Correct fetch to use fetch.fsckObjects and transfer.fsckObjects

git-core configures fsck during fetch using these two variables.
JGit use of fsck in fetch predates the usage in git-core and had
reused receive.fsckobjects, which does not match behavior.

Change-Id: Ie4d5f082258c4b2928c7ecc3780c6363fa587f34
---

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java
index 3a08cd35df..b00d607eee 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java
@@ -63,7 +63,7 @@ public class TransferConfig {
 		}
 	};
 
-	private final boolean fsckObjects;
+	private final boolean fetchFsck;
 	private final boolean allowTipSha1InWant;
 	private final String[] hideRefs;
 
@@ -72,7 +72,10 @@ public class TransferConfig {
 	}
 
 	private TransferConfig(final Config rc) {
-		fsckObjects = rc.getBoolean("receive", "fsckobjects", false); //$NON-NLS-1$ //$NON-NLS-2$
+		fetchFsck = rc.getBoolean(
+				"fetch", "fsckobjects", //$NON-NLS-1$ //$NON-NLS-2$
+				rc.getBoolean("transfer", "fsckobjects", false)); //$NON-NLS-1$ //$NON-NLS-2$
+
 		allowTipSha1InWant = rc.getBoolean(
 				"uploadpack", "allowtipsha1inwant", false); //$NON-NLS-1$ //$NON-NLS-2$
 		hideRefs = rc.getStringList("uploadpack", null, "hiderefs"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -82,7 +85,7 @@ public class TransferConfig {
 	 * @return strictly verify received objects?
 	 */
 	public boolean isFsckObjects() {
-		return fsckObjects;
+		return fetchFsck;
 	}
 
 	/**