Skip to content

Commit dc4a4b7

Browse files
Martin von Zweigbergkgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 10ffca7 commit dc4a4b7

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

git-rebase.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ read_state () {
6161
if test -d "$merge_dir"
6262
then
6363
state_dir="$merge_dir"
64-
prev_head=$(cat "$merge_dir"/prev_head) &&
6564
onto_name=$(cat "$merge_dir"/onto_name) &&
6665
end=$(cat "$merge_dir"/end) &&
6766
msgnum=$(cat "$merge_dir"/msgnum)
@@ -75,7 +74,6 @@ read_state () {
7574
}
7675

7776
continue_merge () {
78-
test -n "$prev_head" || die "prev_head must be defined"
7977
test -d "$merge_dir" || die "$merge_dir directory does not exist"
8078

8179
unmerged=$(git ls-files -u)
@@ -109,10 +107,6 @@ continue_merge () {
109107
test -z "$GIT_QUIET" &&
110108
GIT_PAGER='' git log --format=%s -1 "$cmt"
111109

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-
116110
# onto the next patch:
117111
msgnum=$(($msgnum + 1))
118112
echo "$msgnum" >"$merge_dir/msgnum"
@@ -568,8 +562,6 @@ fi
568562

569563
mkdir -p "$merge_dir"
570564
echo "$onto_name" > "$merge_dir/onto_name"
571-
prev_head=$orig_head
572-
echo "$prev_head" > "$merge_dir/prev_head"
573565
echo "$head_name" > "$merge_dir/head-name"
574566
echo "$onto" > "$merge_dir/onto"
575567
echo "$orig_head" > "$merge_dir/orig-head"

0 commit comments

Comments
 (0)