From bb2ac4fcacaf5044b44e2acb918da33a4cca6af1 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Tue, 20 Mar 2018 10:03:13 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-rebase.sh') 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= -- cgit v1.2.3 From 3d946165e1177905103a25aeb374e018c510e540 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Tue, 20 Mar 2018 10:03:15 +0000 Subject: rebase: respect --no-keep-empty $OPT_SPEC has always allowed --no-keep-empty so lets start handling it. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- git-rebase.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh index 8b1b892d72..37b8f13971 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -263,6 +263,9 @@ do --keep-empty) keep_empty=yes ;; + --no-keep-empty) + keep_empty= + ;; --preserve-merges) preserve_merges=t test -z "$interactive_rebase" && interactive_rebase=implied -- cgit v1.2.3