Skip to content
Permalink
Browse files

[FIXED JENKINS-12369] can't deserialize build history

This amends commit 7656400.
  • Loading branch information
ndeloof committed Feb 28, 2012
1 parent 8840025 commit 1e7d0a2c097b34ca3cd609382be4a7e4a29492bc
Showing with 13 additions and 6 deletions.
  1. +13 −5 src/main/java/hudson/plugins/git/GitSCM.java
  2. +0 −1 src/main/java/hudson/plugins/git/GitTool.java
@@ -1,6 +1,8 @@
package hudson.plugins.git;

import static hudson.Util.fixEmptyAndTrim;
import static hudson.init.InitMilestone.PLUGINS_PREPARED;
import static hudson.init.InitMilestone.PLUGINS_STARTED;

import hudson.AbortException;
import hudson.EnvVars;
@@ -9,6 +11,8 @@
import hudson.FilePath.FileCallable;
import hudson.Launcher;
import hudson.Util;
import hudson.init.InitMilestone;
import hudson.init.Initializer;
import hudson.matrix.MatrixBuild;
import hudson.matrix.MatrixRun;
import hudson.model.AbstractBuild;
@@ -1391,11 +1395,6 @@ private boolean sameScm(String scmName1, String scmName2) {

public DescriptorImpl() {
super(GitSCM.class, GitRepositoryBrowser.class);
Run.XSTREAM.registerConverter(new ObjectIdConverter());
Items.XSTREAM.registerConverter(new RemoteConfigConverter(
Items.XSTREAM));
Items.XSTREAM.alias("org.spearce.jgit.transport.RemoteConfig",
RemoteConfig.class);
load();
}

@@ -1804,7 +1803,16 @@ private boolean isRevExcluded(IGitAPI git, Revision r, TaskListener listener) {
// By default, return false.
return false;
}

@Initializer(before = InitMilestone.JOB_LOADED)
public static void configureXtream() {
Run.XSTREAM.registerConverter(new ObjectIdConverter());
Items.XSTREAM.registerConverter(new RemoteConfigConverter(Items.XSTREAM));
Items.XSTREAM.alias("org.spearce.jgit.transport.RemoteConfig", RemoteConfig.class);
}

private static final Logger LOGGER = Logger.getLogger(GitSCM.class.getName());

/**
* Set to true to enable more logging to build's {@link TaskListener}.
* Used by various classes in this package.
@@ -27,7 +27,6 @@
import java.util.Collections;
import java.util.List;


/**
* Information about Git installation.
*

0 comments on commit 1e7d0a2

Please sign in to comment.
You can’t perform that action at this time.