diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 21:43:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-11 01:08:10 +0300 |
| commit | c6f7de5455269ac1fcd268cd3bf592a0f74c1ef8 (patch) | |
| tree | 76b9ebe22f1cccadbe3cb5b370929d298e313425 /git-rebase--interactive.sh | |
| parent | c5e610be5049f04b3ab8370bb8d1649347d2db87 (diff) | |
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>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | 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 5773b75f54..cf19bf5ae2 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 } |