submodule test: Use config.unset instead of setting to null

Most relative-URL tests for SubmoduleInitCommand carry out the following
steps:

 1. add a submodule at path "sub" to the index
 2. set remote.origin.url in .git/config
 3. configure .gitmodules, possibly using relative URLs, and see what
    happens

resolveWorkingDirectoryRelativeUrl() is meant to test the fallback when
remote.origin.url is not set, to match C git which treats the URL as
relative to the cwd in that case.  To do so, in step (2) it sets
remote.origin.url to null.

However, Config.setString when taking a null value does not actually
unset that value from the configuration --- it sets it to the empty
string.  This means we are testing a behavior that C git never
supported.  Use Config.unset instead.

Change-Id: I7af29fbbd333a2598843d62c320093c48b2ad972
Signed-off-by: Jonathan Nieder <jrn@google.com>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleInitTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleInitTest.java
index 22e55fe729d11f94e0468dda456f52be7d89af60..2b464984705c2e0445fb5bd3a8eb51be44cff002 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleInitTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleInitTest.java
@@ -246,9 +246,8 @@ public class SubmoduleInitTest extends RepositoryTestCase {
                if (File.separatorChar == '\\')
                        base = base.replace('\\', '/');
                FileBasedConfig config = db.getConfig();
-               config.setString(ConfigConstants.CONFIG_REMOTE_SECTION,
-                               Constants.DEFAULT_REMOTE_NAME, ConfigConstants.CONFIG_KEY_URL,
-                               null);
+               config.unset(ConfigConstants.CONFIG_REMOTE_SECTION,
+                               Constants.DEFAULT_REMOTE_NAME, ConfigConstants.CONFIG_KEY_URL);
                config.save();
 
                SubmoduleWalk generator = SubmoduleWalk.forIndex(db);