Web lists-archives.com

Re: [PATCH] git-rebase.sh: handle keep-empty like all other options




Hi Elijah
On 07/06/18 06:07, Elijah Newren wrote:
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
  git-rebase.sh | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 40be59ecc4..a56b286372 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -276,6 +276,7 @@ do
  		;;
  	--keep-empty)
  		keep_empty=yes
+		test -z "$interactive_rebase" && interactive_rebase=implied

I think you need to wait until all the options have been parsed before setting the implied interactive rebase in case the user specifies has '--keep-empty' in an alias and specifies '--no-keep-empty' with some am options on the command line.

Best Wishes

Phillip
  		;;
  	--allow-empty-message)
  		allow_empty_message=--allow-empty-message
@@ -480,11 +481,6 @@ then
  	test -z "$interactive_rebase" && interactive_rebase=implied
  fi
-if test -n "$keep_empty"
-then
-	test -z "$interactive_rebase" && interactive_rebase=implied
-fi
-
  if test -n "$interactive_rebase"
  then
  	type=interactive