From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Tue, 20 Mar 2018 10:03:13 +0000 (+0000)
Subject: rebase --root: stop assuming squash_onto is unset
X-Git-Tag: v2.18.0-rc0~131^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bb2ac4fcacaf5044b44e2acb918da33a4cca6af1

rebase --root: stop assuming squash_onto is unset

If the user set the environment variable 'squash_onto', the 'rebase'
command would erroneously assume that the user passed the option
'--root'.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index fd72a35c65..8b1b892d72 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -60,6 +60,7 @@ $(gettext 'Resolve all conflicts manually, mark them as resolved with
 You can instead skip this commit: run "git rebase --skip".
 To abort and get back to the state before "git rebase", run "git rebase --abort".')
 "
+squash_onto=
 unset onto
 unset restrict_revision
 cmd=