[PATCH v2 30/31] rebase -i: don't read unused variable preserve_merges
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Feb 6, 2011, 18:43 UTC
- Message-ID
- <1297017841-20678-31-git-send-email-martin.von.zweigbergk@gmail.com>
- In-Reply-To
- <1297017841-20678-1-git-send-email-martin.von.zweigbergk@gmail.com>
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> --- Changes since v1:
* Added back call to get_saved_options that I had removed by mistake while reordering commits.
git-rebase--interactive.sh | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 5773b75..cf19bf5 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 }
-- 1.7.4.rc2.33.g8a14f