git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/9] t1508 (at-combinations): test branches separately

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 2, 2013, 17:23 UTC
Message-ID
<CAMP44s3up_xo=oU+5EajoFo7VzA3RDK+hR-maxN9cUw7y=b3Eg@mail.gmail.com>
In-Reply-To
<1367501974-6879-3-git-send-email-artagnon@gmail.com>
On Thu, May 2, 2013 at 8:39 AM, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
Show 37 quoted lines
> From: Felipe Contreras <felipe.contreras@gmail.com>
>
> In the tests involving @{-1} and @{u} as the final component, what we
> really want to check is if it's pointing to the right ref.  We
> currently check the tip commit of the ref, but we can clarify this by
> separating out checking for commits versus checking for refs at
> check().
>
> [rr: commit message, fix arguments in check()]
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  t/t1508-at-combinations.sh | 27 ++++++++++++++++-----------
>  1 file changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
> index 46e3f16..cacb2d0 100755
> --- a/t/t1508-at-combinations.sh
> +++ b/t/t1508-at-combinations.sh
> @@ -4,9 +4,14 @@ test_description='test various @{X} syntax combinations together'
>  . ./test-lib.sh
>
>  check() {
> -test_expect_${3:-success} "$1 = $2" "
> -       echo '$2' >expect &&
> -       git log -1 --format=%s '$1' >actual &&
> +test_expect_${4:-success} "$1 = ${3:-$2}" "
> +       if [ '$2' == 'commit' ]; then
> +               echo '$3' >expect &&
> +               git log -1 --format=%s '$1' >actual
> +       else
> +               echo '${3:-$2}' >expect &&
> +               git rev-parse --symbolic-full-name '$1' >actual
> +       fi &&
>         test_cmp expect actual
>  "
>  }

I'm not sure about this. If we introduce a check that fails, we would have to do:

check HEAD refs/heads/new-branch "" failure

Which doesn't seem clean. Perhaps it makes more sense to always add the type of check:

check HEAD ref refs/heads/new-branch
-- 
Felipe Contreras
Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 4 of 24 in “A natural solution to the @ -> HEAD problem”
  1. 0/9 A natural solution to the @ -> HEAD problemRamkumar Ramachandra, May 2, 2013
  2. 1/9 t1508 (at-combinations): simplify setupRamkumar Ramachandra, May 2, 2013
  3. 2/9 t1508 (at-combinations): test branches separatelyRamkumar Ramachandra, May 2, 2013
  4. Felipe ContrerasMay 2, 2013
  5. Ramkumar RamachandraMay 2, 2013
  6. Felipe ContrerasMay 2, 2013
  7. 3/9 t1508 (at-combinations): improve nonsense()Ramkumar Ramachandra, May 2, 2013
  8. 4/9 t1508 (at-combinations): increase coverageRamkumar Ramachandra, May 2, 2013
  9. Eric SunshineMay 2, 2013
  10. 5/9 t1508 (at-combinations): document @{N} versus HEAD@{N}Ramkumar Ramachandra, May 2, 2013
  11. Felipe ContrerasMay 2, 2013
  12. Ramkumar RamachandraMay 2, 2013
  13. Felipe ContrerasMay 2, 2013
  14. Ramkumar RamachandraMay 2, 2013
  15. 6/9 t1508 (at-combinations): test with symbolic refsRamkumar Ramachandra, May 2, 2013
  16. 7/9 remote.c: teach branch_get() to treat symrefs other than HEADRamkumar Ramachandra, May 2, 2013
  17. Ramkumar RamachandraMay 2, 2013
  18. Ramkumar RamachandraMay 2, 2013
  19. Felipe ContrerasMay 2, 2013
  20. 8/9 sha1_name.c: fix @-parsing bug in interpret_branch_name()Ramkumar Ramachandra, May 2, 2013
  21. 9/9 refs.c: make @ a pseudo-ref alias to HEADRamkumar Ramachandra, May 2, 2013
  22. Ramkumar RamachandraMay 2, 2013
  23. Felipe ContrerasMay 2, 2013
  24. Ramkumar RamachandraMay 2, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.