From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <johannes.sixt@telecom.at>, git@vger.kernel.org
Subject: Re: [PATCH] rebase--interactive: do not use one-or-more (\+) in sed.
Date: Sat, 1 Sep 2007 23:24:39 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0709012324240.28586@racer.site> (raw)
In-Reply-To: <7vejhiu565.fsf_-_@gitster.siamese.dyndns.org>
Hi,
On Sat, 1 Sep 2007, Junio C Hamano wrote:
> This is a continuation of the other one to avoid one-or-more operator
> in sed. At the same time, it actually tightens error checking,
> because the numbers in the squash messages are not padded with
> leading zero and cannot begin with 0.
>
> With this, I think we do not have any more use of one-or-more
> (\+) in sed scripts.
>
> ---
>
> git-rebase--interactive.sh | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index ec798a1..abc2b1c 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -190,7 +190,7 @@ nth_string () {
>
> make_squash_message () {
> if test -f "$SQUASH_MSG"; then
> - COUNT=$(($(sed -n "s/^# This is [^0-9]*\([0-9]\+\).*/\1/p" \
> + COUNT=$(($(sed -n "s/^# This is [^0-9]*\([1-9][0-9]*\).*/\1/p" \
Looks obviously correct to me... Ack.
Ciao,
Dscho
next prev parent reply other threads:[~2007-09-01 22:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-01 7:25 [PATCH] rebase -m: Fix incorrect short-logs of already applied commits Johannes Sixt
2007-09-01 9:01 ` Junio C Hamano
2007-09-01 9:05 ` [PATCH] rebase--interactive: do not use one-or-more (\+) in sed Junio C Hamano
2007-09-01 22:24 ` Johannes Schindelin [this message]
2007-09-02 6:53 ` David Kastrup
2007-09-02 7:02 ` Junio C Hamano
2007-09-02 7:20 ` David Kastrup
2007-09-02 13:39 ` Simon 'corecode' Schubert
2007-09-02 14:20 ` Johannes Schindelin
2007-09-02 17:07 ` Nix
2007-09-05 17:54 ` Benoit SIGOURE
2007-09-05 18:06 ` Nix
2007-09-01 9:20 ` [PATCH] rebase -m: Fix incorrect short-logs of already applied commits David Kastrup
2007-09-01 12:06 ` Johannes Sixt
2007-09-01 12:11 ` Robin Rosenberg
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=Pine.LNX.4.64.0709012324240.28586@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.sixt@telecom.at \
/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).