rebase: remove unused rebase state 'prev_head'

The state stored in $GIT_DIR/rebase-merge/prev_head was introduced in
58634db (rebase: Allow merge strategies to be used when rebasing,
2006-06-21), but it was never used and should therefore be removed.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase.sh b/git-rebase.sh
index 70948bcd23c37c66545e3568e50e58f0a35d9da0..8c1c4ed02c1fa11c8c7f58c6fa695f151a2ee236 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -61,7 +61,6 @@ read_state () {
        if test -d "$merge_dir"
        then
                state_dir="$merge_dir"
        if test -d "$merge_dir"
        then
                state_dir="$merge_dir"

-               prev_head=$(cat "$merge_dir"/prev_head) &&

                onto_name=$(cat "$merge_dir"/onto_name) &&
                end=$(cat "$merge_dir"/end) &&
                msgnum=$(cat "$merge_dir"/msgnum)
                onto_name=$(cat "$merge_dir"/onto_name) &&
                end=$(cat "$merge_dir"/end) &&
                msgnum=$(cat "$merge_dir"/msgnum)


@@ -75,7 +74,6 @@ read_state () {
 }
 
 continue_merge () {
 }
 
 continue_merge () {

-       test -n "$prev_head" || die "prev_head must be defined"

        test -d "$merge_dir" || die "$merge_dir directory does not exist"
 
        unmerged=$(git ls-files -u)
        test -d "$merge_dir" || die "$merge_dir directory does not exist"
 
        unmerged=$(git ls-files -u)


@@ -109,10 +107,6 @@ continue_merge () {
        test -z "$GIT_QUIET" &&
        GIT_PAGER='' git log --format=%s -1 "$cmt"
 
        test -z "$GIT_QUIET" &&
        GIT_PAGER='' git log --format=%s -1 "$cmt"
 

-       prev_head=`git rev-parse HEAD^0`
-       # save the resulting commit so we can read-tree on it later
-       echo "$prev_head" > "$merge_dir/prev_head"
-

        # onto the next patch:
        msgnum=$(($msgnum + 1))
        echo "$msgnum" >"$merge_dir/msgnum"
        # onto the next patch:
        msgnum=$(($msgnum + 1))
        echo "$msgnum" >"$merge_dir/msgnum"


@@ -568,8 +562,6 @@ fi
 
 mkdir -p "$merge_dir"
 echo "$onto_name" > "$merge_dir/onto_name"
 
 mkdir -p "$merge_dir"
 echo "$onto_name" > "$merge_dir/onto_name"

-prev_head=$orig_head
-echo "$prev_head" > "$merge_dir/prev_head"

 echo "$head_name" > "$merge_dir/head-name"
 echo "$onto" > "$merge_dir/onto"
 echo "$orig_head" > "$merge_dir/orig-head"
 echo "$head_name" > "$merge_dir/head-name"
 echo "$onto" > "$merge_dir/onto"
 echo "$orig_head" > "$merge_dir/orig-head"