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

[PATCH v2 0/4] show-branch: add missing tests, trivial color output change

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Jun 17, 2021, 10:53 UTC
Message-ID
<cover-0.4-0000000000-20210617T105245Z-avarab@gmail.com>
In-Reply-To
<cover-0.4-00000000000-20210614T171626Z-avarab@gmail.com>

This v2 doesn't change any of the code (see range-diff), but better explains the change per Michael J Gruber's feedback in https://lore.kernel.org/git/162374905722.40525.516266574605586007.git@grubix.eu/

There's also a trivial grammar fix, s/add/odd/g.
Ævar Arnfjörð Bjarmason (4):
  show-branch tests: rename the one "show-branch" test file
  show-branch tests: modernize test code
  show-branch: don't <COLOR></RESET> for space characters
  show-branch tests: add missing tests
 builtin/show-branch.c          |   9 +-
 t/t3202-show-branch-octopus.sh |  70 ----------------
 t/t3202-show-branch.sh         | 149 +++++++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+), 73 deletions(-)
 delete mode 100755 t/t3202-show-branch-octopus.sh
 create mode 100755 t/t3202-show-branch.sh
Range-diff against v1:
1:  7b8ac43339 = 1:  7b8ac43339 show-branch tests: rename the one "show-branch" test file
2:  27f94abaed = 2:  27f94abaed show-branch tests: modernize test code
3:  8db7029086 ! 3:  937e728f7f show-branch: fix and test --color output
    @@ Metadata
     Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     
      ## Commit message ##
    -    show-branch: fix and test --color output
    +    show-branch: don't <COLOR></RESET> for space characters
     
    -    Fix the "show-branch --color" output so it doesn't needlessly color
    -    and reset each time it emits a space character.
    +    Change the colored output introduced in ab07ba2a24 (show-branch: color
    +    the commit status signs, 2009-04-22) to not color and reset each
    +    individual space character we use for padding. The intent is to color
    +    just the "!", "+" etc. characters.
    +
    +    This makes the output easier to test, so let's do that now. The test
    +    would be much more verbose without a color/reset for each space
    +    character. Since the coloring cycles through colors we previously had
    +    a "rainbow of space characters".
    +
    +    In theory this breaks things for anyone who's relying on the exact
    +    colored output of show-branch, in practice I'd think anyone parsing it
    +    isn't actively turning on the colored output.
     
         Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     
4:  c54c6a7b20 ! 4:  dde0177235 show-branch tests: add missing tests
    @@ Commit message
         This fixes a few more blind spots, but there's still a lot of behavior
         that's not tested for.
     
    -    These new tests show the add (and possibly unintentional) behavior of
    +    These new tests show the odd (and possibly unintentional) behavior of
         --merge-base with one argument, and how its output is the same as "git
         merge-base" with N bases in this particular case. See the test added
         in f621a8454d1 (git-merge-base/git-show-branch --merge-base:
-- 
2.32.0.571.gdba276db2c
Previous: Junio C HamanoNext: Ævar Arnfjörð Bjarmason
Message 8 of 17 in “show-branch: add missing tests, trivial color output fix”
  1. 0/4 show-branch: add missing tests, trivial color output fixÆvar Arnfjörð Bjarmason, Jun 14, 2021
  2. 3/4 show-branch: fix and test --color outputÆvar Arnfjörð Bjarmason, Jun 14, 2021
  3. 4/4 show-branch tests: add missing testsÆvar Arnfjörð Bjarmason, Jun 14, 2021
  4. Michael J GruberJun 15, 2021
  5. 1/4 show-branch tests: rename the one "show-branch" test fileÆvar Arnfjörð Bjarmason, Jun 14, 2021
  6. 2/4 show-branch tests: modernize test codeÆvar Arnfjörð Bjarmason, Jun 14, 2021
  7. Junio C HamanoJun 15, 2021
  8. 0/4 show-branch: add missing tests, trivial color output changeÆvar Arnfjörð Bjarmason, Jun 17, 2021
  9. 1/4 show-branch tests: rename the one "show-branch" test fileÆvar Arnfjörð Bjarmason, Jun 17, 2021
  10. Felipe ContrerasJun 17, 2021
  11. 2/4 show-branch tests: modernize test codeÆvar Arnfjörð Bjarmason, Jun 17, 2021
  12. Felipe ContrerasJun 17, 2021
  13. 4/4 show-branch tests: add missing testsÆvar Arnfjörð Bjarmason, Jun 17, 2021
  14. Felipe ContrerasJun 17, 2021
  15. 3/4 show-branch: don't <COLOR></RESET> for space charactersÆvar Arnfjörð Bjarmason, Jun 17, 2021
  16. Felipe ContrerasJun 17, 2021
  17. Felipe ContrerasJun 17, 2021

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.