Michael Haggerty <mhagger@xxxxxxxxxxxx> 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.
> + COUNT=$(($(sed -n "s/^# Th[^0-9]*\([1-9][0-9]*\)[snrt][tdh] commit message.*:/\1/p" \
> < "$SQUASH_MSG" | sed -ne '$p')+1))
> echo "# This is a combination of $COUNT commits."
> sed -e 1d -e '2,/^./{
> @@ -315,10 +321,26 @@ make_squash_message () {
> echo
> git cat-file commit HEAD | sed -e '1,/^$/d'
> fi
> - echo
> - echo "# This is the $(nth_string $COUNT) commit message:"
> - echo
> - git cat-file commit $1 | sed -e '1,/^$/d'
> + case $1 in
> + squash)
> + echo
> + echo "# This is the $(nth_string $COUNT) commit message:"
> + echo
> + git cat-file commit $2 | sed -e '1,/^$/d'
> + ;;
> + fixup)
> + echo
> + echo "# The $(nth_string $COUNT) commit message will be skipped:"
> + echo
> + # Comment the lines of the commit message out using
> + # "#" rather than "# " (a) to make them more distinct
> + # from the explanatory comments added by this function
> + # and (b) to make it less likely that the sed regexp
> + # above will be confused by a commented-out commit
> + # message.
Use "# " as prefix and you won't have to worry about a line in the log
message that begins with " Th", no?
In any case, I agree that a comment like this is necessary to warn anybody
who will be touching the code that the COUNT=$((...)) needs to avoid
matching what is produced here, but I find the above 6-line comment a bit
too excessive.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html