diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2019-03-18 22:04:05 +0100 |
|---|---|---|
| committer | Sebastian Schuberth <sschuberth@gmail.com> | 2019-05-31 17:11:17 +0200 |
| commit | 9ea1ed158b1af805479561a9b1d92b8341ffc1c5 (patch) | |
| tree | c2ec27bd75498bed85bf9da7701ea5384a987e05 | |
| parent | 237c76fddfbca59062c495ce4b3e05ea61b1cd7e (diff) | |
| download | jgit-9ea1ed158b1af805479561a9b1d92b8341ffc1c5.tar.gz jgit-9ea1ed158b1af805479561a9b1d92b8341ffc1c5.zip | |
cli: Add the --always option to describe
Change-Id: I0342d589e4deabe9d80ea3c9c6b48d7b265d8fe6
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index 47716149bc..2a5a31eba8 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/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 diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java index 6d7df97679..8a572f44b4 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java +++ b/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 { |