Updating tests and documentation Signed-off-by: Harald Nordgren <haraldnordgren@xxxxxxxxx> --- Documentation/git-ls-remote.txt | 5 +++++ t/t5512-ls-remote.sh | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index 5f2628c8f..81c518a90 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -30,6 +30,11 @@ OPTIONS both, references stored in refs/heads and refs/tags are displayed. +-V:: +--version-sort:: + Sort ref names by version semantics, so that refs/tags/v1.2 is sorted + before refs/tags/v1.10. + --refs:: Do not show peeled tags or pseudorefs like HEAD in the output. diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh index 02106c922..680a31223 100755 --- a/t/t5512-ls-remote.sh +++ b/t/t5512-ls-remote.sh @@ -10,6 +10,9 @@ test_expect_success setup ' test_tick && git commit -m initial && git tag mark && + git tag mark1.1 && + git tag mark1.2 && + git tag mark1.10 && git show-ref --tags -d | sed -e "s/ / /" >expected.tag && ( echo "$(git rev-parse HEAD) HEAD" @@ -39,6 +42,17 @@ test_expect_success 'ls-remote self' ' test_cmp expected.all actual ' +test_expect_success 'ls-remote --version-sort --tags self' ' + cat >expect <<-\EOF && + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.1 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.2 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.10 + EOF + git ls-remote --version-sort --tags self >actual && + test_cmp expect actual +' + test_expect_success 'dies when no remote specified and no default remotes found' ' test_must_fail git ls-remote ' @@ -131,7 +145,7 @@ test_expect_success 'Report no-match with --exit-code' ' test_expect_success 'Report match with --exit-code' ' git ls-remote --exit-code other.git "refs/tags/*" >actual && - git ls-remote . tags/mark >expect && + git ls-remote . tags/mark* >expect && test_cmp expect actual ' @@ -178,6 +192,9 @@ test_expect_success 'ls-remote --symref' ' 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/remotes/origin/HEAD 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/remotes/origin/master 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.1 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.10 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.2 EOF git ls-remote --symref >actual && test_cmp expect actual -- 2.14.3 (Apple Git-98)
