rebase-i: style fix

Case arms should align with "case" and "esac".

Do not cat a file into a pipeline; just make the downstream command
read from the file.

Having a while statement as a downstream of a pipe is fine, but
the loop should begin on its own line.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6b86abc64bfe0034caf23cf9530955128766de32..ed57552b7ece38a235043a7aa03a0a413fc41c5f 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -263,10 +263,10 @@ pick_one_preserving_merges () {
        then
                if test "$fast_forward" = t
                then
        then
                if test "$fast_forward" = t
                then

-                       cat "$DOTEST"/current-commit | while read current_commit
+                       while read current_commit

                        do
                                git rev-parse HEAD > "$REWRITTEN"/$current_commit
                        do
                                git rev-parse HEAD > "$REWRITTEN"/$current_commit

-                       done
+                       done <"$DOTEST"/current-commit

                        rm "$DOTEST"/current-commit ||
                        die "Cannot write current commit's replacement sha1"
                fi
                        rm "$DOTEST"/current-commit ||
                        die "Cannot write current commit's replacement sha1"
                fi


@@ -440,9 +440,9 @@ record_in_rewritten() {
        echo "$oldsha1" >> "$REWRITTEN_PENDING"
 
        case "$(peek_next_command)" in
        echo "$oldsha1" >> "$REWRITTEN_PENDING"
 
        case "$(peek_next_command)" in

-           squash|s|fixup|f)
+       squash|s|fixup|f)

                ;;
                ;;

-           *)
+       *)

                flush_rewritten_pending
                ;;
        esac
                flush_rewritten_pending
                ;;
        esac


@@ -890,7 +890,8 @@ first and then run 'git rebase --continue' again."
                git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
                        --abbrev=7 --reverse --left-right --topo-order \
                        $REVISIONS | \
                git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
                        --abbrev=7 --reverse --left-right --topo-order \
                        $REVISIONS | \

-                       sed -n "s/^>//p" | while read shortsha1 rest
+                       sed -n "s/^>//p" |
+               while read shortsha1 rest

                do
                        if test t != "$PRESERVE_MERGES"
                        then
                do
                        if test t != "$PRESERVE_MERGES"
                        then