summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJonathan Nieder2012-11-28 20:48:25 (EST)
committer Jonathan Nieder2012-11-28 20:48:25 (EST)
commitb46b27e3897d5a78d0d3b5766309ee853346c182 (patch)
tree4c9eea28dfcfcd83dd1a7257baee6450e4e3efa6
parent3537f3cc2d5f9fc512a90ecc8f2b17f4689350e9 (diff)
downloadjgit-b46b27e3897d5a78d0d3b5766309ee853346c182.zip
jgit-b46b27e3897d5a78d0d3b5766309ee853346c182.tar.gz
jgit-b46b27e3897d5a78d0d3b5766309ee853346c182.tar.bz2
add: Fix bad metaVar reference in <filepattern> helprefs/changes/27/8927/1
Without this patch, "jgit add --help" throws two exceptions (NoSuchFieldException: metavar_filepattern; MissingResourceException: Can't find resource for bundle java.util.PropertyResourceBundle, key metavar_filepattern) instead of printing a usage message, due to a small typo and a missing declaration. Change-Id: I4b848b3a8c7b1a49d8b9582809375daa4aca6b50
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java2
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java
index 4670b35..12aac77 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java
@@ -57,7 +57,7 @@ class Add extends TextBuiltin {
@Option(name = "--update", aliases = { "-u" }, usage = "usage_onlyMatchAgainstAlreadyTrackedFiles")
private boolean update = false;
- @Argument(required = true, metaVar = "metavar_filepattern", usage = "usage_filesToAddContentFrom")
+ @Argument(required = true, metaVar = "metaVar_filepattern", usage = "usage_filesToAddContentFrom")
private List<String> filepatterns = new ArrayList<String>();
@Override
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
index 0ed6a78..2228555 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
@@ -152,6 +152,7 @@ public class CLIText extends TranslationBundle {
/***/ public String metaVar_diffAlg;
/***/ public String metaVar_directory;
/***/ public String metaVar_file;
+ /***/ public String metaVar_filepattern;
/***/ public String metaVar_gitDir;
/***/ public String metaVar_hostName;
/***/ public String metaVar_linesOfContext;