diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 18:43:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 22:08:08 (GMT) |
| commit | dc4a4b7387f2d7ac5ecce2f5feb2dfa85f378beb (patch) | |
| tree | cdcc8a94b81bf572df9d01a3fa0e067f2753b290 /git-rebase.sh | |
| parent | 10ffca7db2946b4392a38a8f114a0cb3fd6e069c (diff) | |
| download | git-dc4a4b7387f2d7ac5ecce2f5feb2dfa85f378beb.zip git-dc4a4b7387f2d7ac5ecce2f5feb2dfa85f378beb.tar.gz git-dc4a4b7387f2d7ac5ecce2f5feb2dfa85f378beb.tar.bz2 | |
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>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 70948bc..8c1c4ed 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -61,7 +61,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) @@ -75,7 +74,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) @@ -109,10 +107,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" @@ -568,8 +562,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" |