Merge "[pgm] Add option --tags for ls-remote" into stable-3.6
This commit is contained in:
commit
902541f28b
|
@ -104,4 +104,35 @@ public void testLsRemoteHeads() throws Exception {
|
|||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/test",
|
||||
"" }, result.toArray());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLsRemoteTags() throws Exception {
|
||||
final List<String> result = CLIGitCommand.execute(
|
||||
"git ls-remote --tags " + db.getDirectory(), db);
|
||||
assertArrayEquals(new String[] {
|
||||
"efc02078d83a5226986ae917323acec7e1e8b7cb refs/tags/tag1",
|
||||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag1^{}",
|
||||
"4e4b837e0fd4ba83c003678b03592dc1509a4115 refs/tags/tag2",
|
||||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag2^{}",
|
||||
"489384bf8ace47522fe32093d2ceb85b65a6cbb1 refs/tags/tag3",
|
||||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag3^{}",
|
||||
"" }, result.toArray());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLsRemoteHeadsTags() throws Exception {
|
||||
final List<String> result = CLIGitCommand.execute(
|
||||
"git ls-remote --heads --tags " + db.getDirectory(), db);
|
||||
assertArrayEquals(new String[] {
|
||||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/master",
|
||||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/heads/test",
|
||||
"efc02078d83a5226986ae917323acec7e1e8b7cb refs/tags/tag1",
|
||||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag1^{}",
|
||||
"4e4b837e0fd4ba83c003678b03592dc1509a4115 refs/tags/tag2",
|
||||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag2^{}",
|
||||
"489384bf8ace47522fe32093d2ceb85b65a6cbb1 refs/tags/tag3",
|
||||
"d0b1ef2b3dea02bb2ca824445c04e6def012c32c refs/tags/tag3^{}",
|
||||
"" }, result.toArray());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -204,6 +204,7 @@ usage_Glog=View commit history as a graph
|
|||
usage_IndexPack=Build pack index file for an existing packed archive
|
||||
usage_LsRemote=List references in a remote repository
|
||||
usage_lsRemoteHeads=Show only refs starting with refs/heads
|
||||
usage_lsRemoteTags=Show only refs starting with refs/tags
|
||||
usage_LsTree=List the contents of a tree object
|
||||
usage_MakeCacheTree=Show the current cache tree structure
|
||||
usage_MergeBase=Find as good common ancestors as possible for a merge
|
||||
|
|
|
@ -61,6 +61,9 @@ class LsRemote extends TextBuiltin {
|
|||
@Option(name = "--heads", usage = "usage_lsRemoteHeads")
|
||||
private boolean heads;
|
||||
|
||||
@Option(name = "--tags", usage = "usage_lsRemoteTags", aliases = { "-t" })
|
||||
private boolean tags;
|
||||
|
||||
@Option(name = "--timeout", metaVar = "metaVar_service", usage = "usage_abortConnectionIfNoActivity")
|
||||
int timeout = -1;
|
||||
|
||||
|
@ -70,7 +73,7 @@ class LsRemote extends TextBuiltin {
|
|||
@Override
|
||||
protected void run() throws Exception {
|
||||
LsRemoteCommand command = Git.lsRemoteRepository().setRemote(remote)
|
||||
.setTimeout(timeout).setHeads(heads);
|
||||
.setTimeout(timeout).setHeads(heads).setTags(tags);
|
||||
TreeSet<Ref> refs = new TreeSet<Ref>(new Comparator<Ref>() {
|
||||
|
||||
public int compare(Ref r1, Ref r2) {
|
||||
|
|
Loading…
Reference in New Issue