From: Martin von Zweigbergk Date: Thu, 25 Nov 2010 19:57:47 GMT Subject: [PATCH/RFC 04/20] rebase: remove unused rebase state 'prev_head' Message-ID: <1290715083-16919-5-git-send-email-martin.von.zweigbergk@gmail.com> In-Reply-To: <1290715083-16919-1-git-send-email-martin.von.zweigbergk@gmail.com> The rebase state 'prev_head' is not used. Remove it. Signed-off-by: Martin von Zweigbergk --- git-rebase.sh | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index b1fadb6..aaee06b 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -60,7 +60,6 @@ read_state () { 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) @@ -74,7 +73,6 @@ read_state () { } 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) @@ -108,10 +106,6 @@ continue_merge () { 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" @@ -566,8 +560,6 @@ fi 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" -- 1.7.3.2.864.gbbb96