Browse Source

cli: Add the --always option to describe

Change-Id: I0342d589e4deabe9d80ea3c9c6b48d7b265d8fe6
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
stable-5.5
Sebastian Schuberth 6 years ago
parent
commit
9ea1ed158b
  1. 1
      org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
  2. 4
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java

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

@ -222,6 +222,7 @@ unsupportedOperation=Unsupported operation: {0}
untrackedFiles=Untracked files:
updating=Updating {0}..{1}
usage_Aggressive=This option will cause gc to more aggressively optimize the repository at the expense of taking much more time
usage_AlwaysFallback=Show uniquely abbreviated commit object as fallback
usage_bareClone=Make a bare Git repository. That is, instead of creating [DIRECTORY] and placing the administrative files in [DIRECTORY]/.git, make the [DIRECTORY] itself the $GIT_DIR.
usage_Blame=Show what revision and author last modified each line
usage_Clean=Remove untracked files from the working tree

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java

@ -68,6 +68,9 @@ class Describe extends TextBuiltin {
@Option(name = "--tags", usage = "usage_UseTags")
private boolean useTags;
@Option(name = "--always", usage = "usage_AlwaysFallback")
private boolean always;
@Option(name = "--match", usage = "usage_Match", metaVar = "metaVar_pattern")
private List<String> patterns = new ArrayList<>();
@ -81,6 +84,7 @@ class Describe extends TextBuiltin {
}
cmd.setLong(longDesc);
cmd.setTags(useTags);
cmd.setAlways(always);
cmd.setMatch(patterns.toArray(new String[0]));
String result = null;
try {

Loading…
Cancel
Save