From: Thomas Rast <trast@student.ethz.ch>
To: Andrew Sayers <andrew-git@pileofstuff.org>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, <git@vger.kernel.org>,
John Tapsell <johnflux@gmail.com>,
Steven Michalske <smichalske@gmail.com>,
Michael J Gruber <git@drmicha.warpmail.net>
Subject: [PATCH 0/2] bash completion: Support "divergence from upstream" warnings in __git_ps1
Date: Thu, 10 Jun 2010 13:47:22 +0200 [thread overview]
Message-ID: <cover.1276169807.git.trast@student.ethz.ch> (raw)
In-Reply-To: <4C0EB7F1.1030707@pileofstuff.org>
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(-)
next prev parent reply other threads:[~2010-06-10 11:47 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-06 0:05 [PATCH] bash completion: Support "unpushed commits" warnings in __git_ps1 Andrew Sayers
2010-06-06 18:14 ` Thomas Rast
2010-06-06 20:49 ` Andrew Sayers
2010-06-06 21:07 ` Jakub Narebski
2010-06-06 22:19 ` Andrew Sayers
2010-06-07 7:42 ` Thomas Rast
2010-06-08 21:36 ` [RFC/PATCHv2] bash completion: Support "divergence from upstream" " Andrew Sayers
2010-06-09 8:21 ` Peter Kjellerstedt
2010-06-09 8:45 ` John Tapsell
2010-06-09 21:02 ` Steven Michalske
2010-06-09 9:17 ` Michael J Gruber
2010-06-09 20:48 ` Michael J Gruber
2010-06-09 21:03 ` Michael J Gruber
2010-06-10 11:47 ` Thomas Rast [this message]
2010-06-10 11:47 ` [PATCH 1/2] rev-list: introduce --count option Thomas Rast
2010-06-10 11:47 ` [PATCH 2/2] bash completion: Support "divergence from upstream" warnings in __git_ps1 Thomas Rast
2010-06-12 0:00 ` SZEDER Gábor
2010-06-12 10:03 ` [PATCH v2 0/2] " Thomas Rast
2010-06-12 9:59 ` [PATCH v2 1/2] rev-list: introduce --count option Thomas Rast
2010-06-12 9:59 ` [PATCH v2 2/2] bash completion: Support "divergence from upstream" warnings in __git_ps1 Thomas Rast
2010-06-14 3:13 ` Junio C Hamano
2010-06-14 7:44 ` Thomas Rast
2010-06-14 12:36 ` SZEDER Gábor
2010-06-12 10:11 ` vger doesn't like UTF-8 from send-email Thomas Rast
2010-06-12 15:06 ` [PATCH] send-email: ask about and declare 8bit mails Thomas Rast
2010-06-12 16:28 ` Junio C Hamano
2010-06-13 15:09 ` Thomas Rast
2010-06-13 4:15 ` vger doesn't like UTF-8 from send-email Michael Witten
2010-06-14 11:57 ` Erik Faye-Lund
2010-06-12 20:50 ` [PATCH] bash completion: Support "divergence from upstream" messages in __git_ps1 Andrew Sayers
2010-06-14 7:42 ` Thomas Rast
2010-06-15 21:50 ` [PATCHv4] " Andrew Sayers
2010-06-16 19:05 ` Junio C Hamano
2010-06-16 19:11 ` Thomas Rast
2010-06-17 21:31 ` [PATCHv5 0/2] " Andrew Sayers
2010-06-18 16:10 ` Junio C Hamano
2010-06-18 21:02 ` Andrew Sayers
2010-06-17 21:32 ` [PATCHv5 1/2] " Andrew Sayers
2010-06-17 21:32 ` [PATCHv5 2/2] bash-completion: Fix __git_ps1 to work with "set -u" Andrew Sayers
2010-06-10 13:31 ` [PATCH 0/2] bash completion: Support "divergence from upstream" warnings in __git_ps1 Michael J Gruber
2010-06-10 12:03 ` [RFC/PATCHv2] " Thomas Rast
2010-06-06 20:12 ` [PATCH] bash completion: Support "unpushed commits" " Thomas Rast
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1276169807.git.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=andrew-git@pileofstuff.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=johnflux@gmail.com \
--cc=smichalske@gmail.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).