rebase -i: don't read unused variable preserve_merges
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>
Martin von Zweigbergk committed
Feb 6, 2011 at 13:43 UTC
c6f7de5455269ac1fcd268cd3bf592a0f74c1ef8
1 file changed
-1
git-rebase--interactive.sh
-1
@@ -583,7 +583,6 @@ skip_unnecessary_picks () {
583
}
584
585
get_saved_options () {
586
- test -d "$rewritten" && preserve_merges=t
586
test -f "$state_dir"/rebase-root && rebase_root=t
587
}
588