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

[PATCH 1/5] t1508 (at-combinations): more tests; document failures

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
May 1, 2013, 16:20 UTC
Message-ID
<1367425235-14998-2-git-send-email-artagnon@gmail.com>
In-Reply-To
<1367425235-14998-1-git-send-email-artagnon@gmail.com>

To emphasize what we're testing in @{1}@{u}, document that @{0}@{0} is also nonsense. This makes it clear that @{<n>} does not resolve to a ref whose upstream we can determine with @{u}/ reflog we can dig with @{0}.

Since HEAD is implicit in @{}, check that HEAD@{} works fine for these cases. It doesn't make sense in @{-<n>} because @{-<n>} cannot be used with anything other than HEAD, and interpret_nth_prior_checkout() hard-codes "HEAD".

Additionally, document bugs in the @-parser by symbolic-ref'ing @ to HEAD and re-running some tests.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 t/t1508-at-combinations.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index d5d6244..efa2a2a 100755
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -39,13 +39,27 @@ test_expect_success 'setup' '
 
 check HEAD new-two
 check "@{1}" new-one
+check "HEAD@{1}" new-one
+check "@{now}" new-two
+check "HEAD@{now}" new-two
 check "@{-1}" old-two
 check "@{-1}@{1}" old-one
 check "@{u}" upstream-two
+check "HEAD@{u}" upstream-two
 check "@{u}@{1}" upstream-one
 check "@{-1}@{u}" master-two
 check "@{-1}@{u}@{1}" master-one
 nonsense "@{u}@{-1}"
+nonsense "@{0}@{0}"
 nonsense "@{1}@{u}"
+nonsense "HEAD@{-1}"
+
+# Make sure that the @-parser isn't buggy; check things with
+# symbolic-ref @ pointing to HEAD.
+git symbolic-ref @ HEAD
+check "@@{1}" new-one
+check "@@{now}" new-two
+check "@@{u}" upstream-two failure
+nonsense "@@{-1}"
 
 test_done
-- 
1.8.3.rc0.24.g6456091
Previous: Ramkumar RamachandraNext: Junio C Hamano
Message 2 of 49 in “A natural solution to the @ -> HEAD problem”
  1. 0/5 A natural solution to the @ -> HEAD problemRamkumar Ramachandra, May 1, 2013
  2. 1/5 t1508 (at-combinations): more tests; document failuresRamkumar Ramachandra, May 1, 2013
  3. Junio C HamanoMay 1, 2013
  4. Ramkumar RamachandraMay 1, 2013
  5. Jeff KingMay 1, 2013
  6. Ramkumar RamachandraMay 1, 2013
  7. Junio C HamanoMay 1, 2013
  8. Felipe ContrerasMay 2, 2013
  9. Ramkumar RamachandraMay 2, 2013
  10. Felipe ContrerasMay 2, 2013
  11. Ramkumar RamachandraMay 2, 2013
  12. Ramkumar RamachandraMay 2, 2013
  13. Felipe ContrerasMay 2, 2013
  14. Ramkumar RamachandraMay 2, 2013
  15. Felipe ContrerasMay 2, 2013
  16. Ramkumar RamachandraMay 2, 2013
  17. Felipe ContrerasMay 2, 2013
  18. Ramkumar RamachandraMay 2, 2013
  19. David AguilarMay 4, 2013
  20. David AguilarMay 4, 2013
  21. 2/5 sha1_name.c: don't waste cycles in the @-parsing loopRamkumar Ramachandra, May 1, 2013
  22. Felipe ContrerasMay 1, 2013
  23. Ramkumar RamachandraMay 1, 2013
  24. Junio C HamanoMay 2, 2013
  25. 3/5 sha1_name.c: simplify @-parsing in get_sha1_basic()Ramkumar Ramachandra, May 1, 2013
  26. Felipe ContrerasMay 1, 2013
  27. Ramkumar RamachandraMay 1, 2013
  28. Jonathan NiederMay 1, 2013
  29. Ramkumar RamachandraMay 1, 2013
  30. Felipe ContrerasMay 1, 2013
  31. Ramkumar RamachandraMay 1, 2013
  32. Felipe ContrerasMay 1, 2013
  33. Ramkumar RamachandraMay 1, 2013
  34. Felipe ContrerasMay 1, 2013
  35. Ramkumar RamachandraMay 1, 2013
  36. 4/5 remote.c: teach branch_get() to treat symrefs other than HEADRamkumar Ramachandra, May 1, 2013
  37. Felipe ContrerasMay 1, 2013
  38. Ramkumar RamachandraMay 1, 2013
  39. Felipe ContrerasMay 1, 2013
  40. Ramkumar RamachandraMay 1, 2013
  41. Felipe ContrerasMay 1, 2013
  42. Ramkumar RamachandraMay 1, 2013
  43. Felipe ContrerasMay 1, 2013
  44. 5/5 refs.c: make @ a pseudo-ref alias to HEADRamkumar Ramachandra, May 1, 2013
  45. Felipe ContrerasMay 1, 2013
  46. Ramkumar RamachandraMay 1, 2013
  47. Felipe ContrerasMay 1, 2013
  48. Ramkumar RamachandraMay 1, 2013
  49. Ramkumar RamachandraMay 1, 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.