Drop strbuf's 'eof' marker, and make read_line a first class citizen.

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 9cf005677c2936a7c2f14a00cc4e91670e2259f3..c9942f24009bd01ee0fee8990f64e64d9e43364c 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -69,13 +69,10 @@ continue_merge () {
                        die "$RESOLVEMSG"
                fi
                printf "Committed: %0${prec}d " $msgnum
-               git rev-list --pretty=oneline -1 HEAD | \
-                       sed 's/^[a-f0-9]\+ //'
        else
                printf "Already applied: %0${prec}d " $msgnum
-               git rev-list --pretty=oneline -1 "$cmt" | \
-                       sed 's/^[a-f0-9]\+ //'
        fi
+       git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //'
 
        prev_head=`git rev-parse HEAD^0`
        # save the resulting commit so we can read-tree on it later
@@ -219,9 +216,11 @@ do
        -v|--verbose)
                verbose=t
                ;;
+       --whitespace=*)
+               git_am_opt="$git_am_opt $1"
+               ;;
        -C*)
-               git_am_opt=$1
-               shift
+               git_am_opt="$git_am_opt $1"
                ;;
        -*)
                usage