Browse Source

Merge branch 'stable-4.5'

* stable-4.5:
  pgm: Fix misspelled key of an externalized string
  Add missing online help for Ketch server type option in CLI daemon
  Remove wrong junit dependencies in org.eclipse.jgit.pgm

Change-Id: I9cac024c0b488101b539c713b0f5ffc8c01b55bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.6
Matthias Sohn 8 years ago
parent
commit
8f6b75f7ad
  1. 11
      org.eclipse.jgit.pgm/pom.xml
  2. 2
      org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
  3. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java
  4. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java

11
org.eclipse.jgit.pgm/pom.xml

@ -128,17 +128,6 @@
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.junit.http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs</artifactId>

2
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties

@ -114,6 +114,7 @@ metaVar_file=FILE
metaVar_filepattern=filepattern
metaVar_gitDir=GIT_DIR
metaVar_hostName=HOSTNAME
metaVar_ketchServerType=SERVERTYPE
metaVar_lfsStorage=STORAGE
metaVar_linesOfContext=lines
metaVar_message=message
@ -232,6 +233,7 @@ usage_DisplayTheVersionOfJgit=Display the version of jgit
usage_Gc=Cleanup unnecessary files and optimize the local repository
usage_Glog=View commit history as a graph
usage_IndexPack=Build pack index file for an existing packed archive
usage_ketchServerType=Ketch server type
usage_LFSDirectory=Directory to store large objects
usage_LFSPort=Server http port
usage_LFSRunStore=Store (fs | s3), store lfs objects in file system or Amazon S3

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java

@ -50,7 +50,7 @@ import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.pgm.internal.CLIText;
import org.kohsuke.args4j.Option;
@Command(common = true, usage = "usage_clean")
@Command(common = true, usage = "usage_Clean")
class Clean extends TextBuiltin {
@Option(name = "-d", usage = "usage_removeUntrackedDirectories")
private boolean dirs = false;

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java

@ -101,7 +101,7 @@ class Daemon extends TextBuiltin {
@Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk")
boolean exportAll;
@Option(name = "--ketch")
@Option(name = "--ketch", metaVar = "metaVar_ketchServerType", usage = "usage_ketchServerType")
KetchServerType ketchServerType;
enum KetchServerType {

Loading…
Cancel
Save