From b6f954ad426f91561b4aa09d7ba23652516e7b0a Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 24 Mar 2017 10:26:44 +0900 Subject: Fetch: Add --recurse-submodules and --no-recurse-submodules options Add options to control recursion into submodules on fetch. Add a callback interface on FetchCommand, to allow Fetch to display an update "Fetching submodule XYZ" for each submodule. Change-Id: Id805044b57289ee0f384b434aba1dbd2fd317e5b Signed-off-by: David Pursehouse Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/lib/SubmoduleConfig.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SubmoduleConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SubmoduleConfig.java index 3126160c33..12f7b82343 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SubmoduleConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SubmoduleConfig.java @@ -43,6 +43,10 @@ package org.eclipse.jgit.lib; +import java.util.Locale; + +import org.eclipse.jgit.util.StringUtils; + /** * Submodule section of a Git configuration file. * @@ -75,12 +79,17 @@ public class SubmoduleConfig { @Override public String toConfigValue() { - return configValue; + return name().toLowerCase(Locale.ROOT).replace('_', '-'); } @Override public boolean matchConfigValue(String s) { - return configValue.equals(s); + if (StringUtils.isEmptyOrNull(s)) { + return false; + } + s = s.replace('-', '_'); + return name().equalsIgnoreCase(s) + || configValue.equalsIgnoreCase(s); } } } -- cgit v1.2.3