From 9c9214a27f98f7335b23aa6ac7734757dd842024 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Tue, 28 Dec 2010 10:30:47 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0763ef562..d20a9b218 100755 --- 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 } @@ -650,8 +649,6 @@ rearrange_squash () { case "$action" in continue) - get_saved_options - # do we have anything to commit? if git diff-index --cached --quiet --ignore-submodules HEAD -- then @@ -682,8 +679,6 @@ first and then run 'git rebase --continue' again." do_rest ;; skip) - get_saved_options - git rerere clear do_rest -- 2.30.2