Skip to content

Commit c6f7de5

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

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

git-rebase--interactive.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@ skip_unnecessary_picks () {
583583
}
584584

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

0 commit comments

Comments
 (0)