Ignore invalid TagOpt values

C git silently ignores invalid tagopt values; so make JGit behave the
same way.

Bug: 429625
Change-Id: I99587cc46c7e0c19348bcc63f602038fa9a7f378
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
Thomas Wolf 2017-08-22 13:23:10 +02:00 committed by Matthias Sohn
parent 8cbdf523cd
commit 426caf99ee
1 changed files with 7 additions and 2 deletions

View File

@ -206,8 +206,13 @@ public RemoteConfig(final Config rc, final String remoteName)
}
receivepack = val;
val = rc.getString(SECTION, name, KEY_TAGOPT);
tagopt = TagOpt.fromOption(val);
try {
val = rc.getString(SECTION, name, KEY_TAGOPT);
tagopt = TagOpt.fromOption(val);
} catch (IllegalArgumentException e) {
// C git silently ignores invalid tagopt values.
tagopt = TagOpt.AUTO_FOLLOW;
}
mirror = rc.getBoolean(SECTION, name, KEY_MIRROR, DEFAULT_MIRROR);
timeout = rc.getInt(SECTION, name, KEY_TIMEOUT, 0);
}