On Wed, Feb 08, 2012 at 03:58:57PM -0500, Jeff King wrote: >On Wed, Feb 08, 2012 at 12:12:52PM -0800, Tom Grennan wrote: > >> This filters the list for tags of the given object. >> Example, >> >> john$ git tag v1.0-john v1.0 >> john$ git tag -l --points-at v1.0 >> v1.0-john > >And probably "v1.0", as well, in this iteration. :) Yep. >The patch content itself looks good to me, except: > >> --- a/Documentation/git-tag.txt >> +++ b/Documentation/git-tag.txt >> @@ -12,7 +12,7 @@ SYNOPSIS >> 'git tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] >> <tagname> [<commit> | <object>] >> 'git tag' -d <tagname>... >> -'git tag' [-n[<num>]] -l [--contains <commit>] >> +'git tag' [-n[<num>]] -l [--contains <commit>] [--points-at <object>] >> [--column[=<options>] | --no-column] [<pattern>...] > >What's this "column" stuff doing here? The nd/columns topic is still in >"next", isn't it? Did you base this on "next" or "pu"? > >Usually topics should be based on master, so they can graduate >independently of each other. In this case, it might make sense to build >on top of jk/maint-tag-show-fixes (d0548a3), but I don't think that is >even necessary here (my fixes ended up not being too closely related, I >think). Yes, it's no longer related to jk/maint-tag-show-fixes. I've prepared a rebase patch to master and will add these tests. Thanks, TomG >Other than that, I think the patch is fine. There are no tests, so >perhaps these should be squashed in: > >diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh >index e93ac73..f61e398 100755 >--- a/t/t7004-tag.sh >+++ b/t/t7004-tag.sh >@@ -1269,4 +1269,43 @@ test_expect_success 'mixing incompatibles modes and options is forbidden' ' > test_must_fail git tag -v -s > ' > >+# check points-at >+ >+test_expect_success '--points-at cannot be used in non-list mode' ' >+ test_must_fail git tag --points-at=v4.0 foo >+' >+ >+test_expect_success '--points-at finds lightweight tags' ' >+ echo v4.0 >expect && >+ git tag --points-at v4.0 >actual && >+ test_cmp expect actual >+' >+ >+test_expect_success '--points-at finds annotated tags of commits' ' >+ git tag -m "v4.0, annotated" annotated-v4.0 v4.0 && >+ echo annotated-v4.0 >expect && >+ git tag -l --points-at v4.0 "annotated*" >actual && >+ test_cmp expect actual >+' >+ >+test_expect_success '--points-at finds annotated tags of tags' ' >+ git tag -m "describing the v4.0 tag object" \ >+ annotated-again-v4.0 annotated-v4.0 && >+ cat >expect <<-\EOF && >+ annotated-again-v4.0 >+ annotated-v4.0 >+ EOF >+ git tag --points-at=annotated-v4.0 >actual && >+ test_cmp expect actual >+' >+ >+test_expect_success 'multiple --points-at are OR-ed together' ' >+ cat >expect <<-\EOF && >+ v2.0 >+ v3.0 >+ EOF >+ git tag --points-at=v2.0 --points-at=v3.0 >actual && >+ test_cmp expect actual >+' >+ > test_done >-- >1.7.9.rc2.14.g3da2b > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html