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>
Martin von Zweigbergk committed
Feb 6, 2011 at 13:43 UTC
dc4a4b7387f2d7ac5ecce2f5feb2dfa85f378beb
1 file changed
-8
git-rebase.sh
-8
@@ -61,7 +61,6 @@ read_state () {
61
if test -d "$merge_dir"
62
then
63
state_dir="$merge_dir"
64
- prev_head=$(cat "$merge_dir"/prev_head) &&
64
onto_name=$(cat "$merge_dir"/onto_name) &&
65
end=$(cat "$merge_dir"/end) &&
66
msgnum=$(cat "$merge_dir"/msgnum)
@@ -75,7 +74,6 @@ read_state () {
74
}
75
76
continue_merge () {
78
- test -n "$prev_head" || die "prev_head must be defined"
77
test -d "$merge_dir" || die "$merge_dir directory does not exist"
78
79
unmerged=$(git ls-files -u)
@@ -109,10 +107,6 @@ continue_merge () {
107
test -z "$GIT_QUIET" &&
108
GIT_PAGER='' git log --format=%s -1 "$cmt"
109
112
- prev_head=`git rev-parse HEAD^0`
113
- # save the resulting commit so we can read-tree on it later
114
- echo "$prev_head" > "$merge_dir/prev_head"
115
-
110
# onto the next patch:
111
msgnum=$(($msgnum + 1))
112
echo "$msgnum" >"$merge_dir/msgnum"
@@ -568,8 +562,6 @@ fi
562
563
mkdir -p "$merge_dir"
564
echo "$onto_name" > "$merge_dir/onto_name"
571
-prev_head=$orig_head
572
-echo "$prev_head" > "$merge_dir/prev_head"
565
echo "$head_name" > "$merge_dir/head-name"
566
echo "$onto" > "$merge_dir/onto"
567
echo "$orig_head" > "$merge_dir/orig-head"