motiejus
/
jgit
1
Fork 0
Code Releases Activity

DescribeCommand: Add support for --abbrev=0 

Setting --abbrev=0 suppresses long format and only shows the closest tag
[1].

[1] https://git-scm.com/docs/git-describe#Documentation/git-describe.txt---abbrevltngt

Change-Id: Ifcf4d7786dd0f0fb0315d8093fdb54384ed9d5f9
This commit is contained in:
Matthias Sohn 2022-02-20 12:03:22 +01:00
parent 00bb7cc9a5
commit a2d5650b8f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java
View File

@ -102,6 +102,8 @@ public void testDescribe() throws Exception {
assertEquals("alice-t1-2-g3e563c5", describe(c4, "alice*"));
assertEquals("bob-t2-1-g3e563c5", describe(c4, "bob*"));
assertEquals("bob-t2-1-g3e563c5", describe(c4, "a*", "b*", "c*"));
assertEquals("bob-t2", describe(c4, false, true, 0));
} else {
assertEquals(null, describe(c2));
assertEquals(null, describe(c3));

3
org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java
View File

@ -227,6 +227,9 @@ public DescribeCommand setAbbrev(int abbrev) {
private String longDescription(Ref tag, int depth, ObjectId tip)
throws IOException {
if (abbrev == 0) {
return formatRefName(tag.getName());
}
return String.format("%s-%d-g%s", formatRefName(tag.getName()), //$NON-NLS-1$
Integer.valueOf(depth),
w.getObjectReader().abbreviate(tip, abbrev).name());