Skip to content

Commit

Permalink
rebase -i: don't read unused variable preserve_merges
Browse files Browse the repository at this point in the history
Since 8e4a91b (rebase -i: remember the settings of -v, -s and -p when
interrupted, 2007-07-08), the variable preserve_merges (then called
PRESERVE_MERGES) was detected from the state saved in
$GIT_DIR/rebase-merge in order to be used when the rebase resumed, but
its value was never actually used. The variable's value was only used
when the rebase was initated.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Martin von Zweigbergk authored and Junio C Hamano committed Feb 10, 2011
1 parent c5e610b commit c6f7de5
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,6 @@ skip_unnecessary_picks () {
}

get_saved_options () {
test -d "$rewritten" && preserve_merges=t
test -f "$state_dir"/rebase-root && rebase_root=t
}

Expand Down

0 comments on commit c6f7de5

Please sign in to comment.