Re: [PATCHv3 0/2] Add a "fixup" command to "rebase --interactive"
Hi,
On Mon, 7 Dec 2009, Michael Haggerty wrote:
Show 25 quoted lines
> Junio C Hamano wrote:
> > Michael Haggerty <mhagger@alum.mit.edu> writes:
> >
> >> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> >> index 0bd3bf7..a7de5ea 100755
> >> --- a/git-rebase--interactive.sh
> >> +++ b/git-rebase--interactive.sh
> >> @@ -302,7 +302,13 @@ nth_string () {
> >>
> >> make_squash_message () {
> >> if test -f "$SQUASH_MSG"; then
> >> - COUNT=$(($(sed -n "s/^# This is [^0-9]*\([1-9][0-9]*\).*/\1/p" \
> >> + # We want to be careful about matching only the commit
> >> + # message comment lines generated by this function.
> >
> >> + # But supposedly some sed versions don't handle "\|"
> >> + # correctly, so instead of "\(st\|nd\|rd\|th\)", use
> >> + # the less accurate "[snrt][tdh]" to match the
> >> + # nth_string endings.
> >
> > I'd drop this comment; blaming POSIX-compliant sed without GNU extension
> > is simply wrong.
>
> Fair enough. I hope you don't mind my leaving a line explaining the
> cryptic "[snrt][tdh]" to save Dscho a couple of seconds next time :-).Thanks, very much appreciated here.
My ACK for the patches is still valid.
Johannes Schindelin <johannes.schindelin@gmx.de>