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

Re: [PATCH 0/2] bash completion: Support "divergence from upstream" warnings in __git_ps1

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Jun 10, 2010, 13:31 UTC
Message-ID
<4C10E921.1030909@drmicha.warpmail.net>
In-Reply-To
<cover.1276169807.git.trast@student.ethz.ch>
Thomas Rast venit, vidit, dixit 10.06.2010 13:47:
Show 50 quoted lines
> Andrew Sayers wrote:
>> +                                       case "$p" in
>> +                                               \<*\>*|\>*\<* ) p="<>" ;;
>> +                                               *\<*          ) p="<"  ;;
>> +                                               *\>*          ) p=">"  ;;
>> +                                               ""            ) p="="  ;;
>> +
>> +                                               # the following case shouldn't be possible
>> +                                               # if you see this, please report it as a bug
>> +                                               * ) p="?ERROR($p)?" ;;
>> +
>> +                                       esac
> 
> I didn't really like this bit, since rev-list has to format the output
> only so you can match it.  I realized that I too have written code in
> the past to detect which way this goes (in post-receive hooks), and/or
> the number of commits as per the request
> 
> John Tapsell wrote:
>> I hate to get all feature-bloat on you...
>>
>> But could it state the number of commits as well please? :) :)
> 
> So here's an additional patch to provide rev-list logic that supports
> this feature.  I have then tweaked your original patch to make use of
> it a u+7-5 style.
> 
> I'm not too picky about the exact style that it turns out to have in
> the end; I have used my own customized version ever since we started
> printing a space before the (master *+) dirtiness indicator.  However,
> I think we should try to be as unambiguous and short as possible.
> Hence I picked the 'u' prefix to avoid ambiguity with the dirtiness
> indicator.
> 
> 
> Andrew Sayers (1):
>   bash completion: Support "divergence from upstream" warnings in
>     __git_ps1
> 
> Thomas Rast (1):
>   rev-list: introduce --count option
> 
>  Documentation/rev-list-options.txt     |    9 +++++
>  builtin/rev-list.c                     |   16 +++++++++
>  contrib/completion/git-completion.bash |   57 +++++++++++++++++++++++++++++++-
>  revision.c                             |    2 +
>  revision.h                             |    5 +++
>  t/t6007-rev-list-cherry-pick-file.sh   |   29 ++++++++++++++++
>  6 files changed, 117 insertions(+), 1 deletions(-)
> 

Checked and tested. After setting DIFF, even the tests pass! But we can probably do without the debug_p line ;)

Liked-by: Michael J Gruber <git@drmicha.warpmail.net>
Previous: SZEDER GáborNext: Thomas Rast
Message 18 of 20 in “bash completion: Support "unpushed commits" warnings in __git_ps1”
  1. bash completion: Support "unpushed commits" warnings in __git_ps1Andrew Sayers, Jun 6, 2010
  2. Thomas RastJun 6, 2010
  3. Andrew SayersJun 6, 2010
  4. Jakub NarebskiJun 6, 2010
  5. Andrew SayersJun 6, 2010
  6. Thomas RastJun 7, 2010
  7. [RFC/PATCHv2] bash completion: Support "divergence from upstream" warnings in __git_ps1Andrew Sayers, Jun 8, 2010
  8. Peter KjellerstedtJun 9, 2010
  9. John TapsellJun 9, 2010
  10. Steven MichalskeJun 9, 2010
  11. Michael J GruberJun 9, 2010
  12. Michael J GruberJun 9, 2010
  13. Michael J GruberJun 9, 2010
  14. 0/2 bash completion: Support "divergence from upstream" warnings in __git_ps1Thomas Rast, Jun 10, 2010
  15. 1/2 rev-list: introduce --count optionThomas Rast, Jun 10, 2010
  16. 2/2 bash completion: Support "divergence from upstream" warnings in __git_ps1Thomas Rast, Jun 10, 2010
  17. SZEDER GáborJun 12, 2010
  18. Michael J GruberJun 10, 2010
  19. Thomas RastJun 10, 2010
  20. Thomas RastJun 6, 2010

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.