Merge "Release fails when non-git map entries encountered This is a squashed version of my previous patch"
diff --git a/org.eclipse.egit.fetchfactory/src/org/eclipse/egit/internal/fetchfactory/GITFetchTaskFactory.java b/org.eclipse.egit.fetchfactory/src/org/eclipse/egit/internal/fetchfactory/GITFetchTaskFactory.java
index 372c739..370e1a8 100644
--- a/org.eclipse.egit.fetchfactory/src/org/eclipse/egit/internal/fetchfactory/GITFetchTaskFactory.java
+++ b/org.eclipse.egit.fetchfactory/src/org/eclipse/egit/internal/fetchfactory/GITFetchTaskFactory.java
@@ -495,6 +495,10 @@
locationToCheckIfPluginLocal.toString());
script.printAntCallTask(TARGET_CLONE_REPO, true, params);
+ // re-determine availability of local repo (done to avoid unnecessary
+ // Git operations)
+ printAvailableTask(localGitRepo, localGitRepo, script);
+
// checkout the tag
params.clear();
params.put(PROP_GITREPO_LOCAL_PATH, localGitRepo);
@@ -503,10 +507,6 @@
params.put(PROP_FILETOCHECK,
locationToCheckIfPluginLocal.toString());
script.printAntCallTask(TARGET_CHECKOUT_TAG, true, params);
-
- // re-determine availability of local repo (done to avoid unnecessary
- // Git operations)
- printAvailableTask(localGitRepo, localGitRepo, script);
}
private void printConditionEnd(IAntScript script) {
