rebase -i: don't read unused variable preserve_merges

Martin von Zweigbergk · gitster · commit c6f7de545526 · 2011-02-10T14:08:10.000-08:00
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>
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
@@ -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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,6 @@ skip_unnecessary_picks () {`
`583`	`583`	`}`
`584`	`584`
`585`	`585`	`get_saved_options () {`
`586`		`- test -d "$rewritten" && preserve_merges=t`
`587`	`586`	`test -f "$state_dir"/rebase-root && rebase_root=t`
`588`	`587`	`}`
`589`	`588`