# [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option

2 messages from 2008-02-05 to 2008-02-06. Participants: Jari Aalto, Junio C Hamano.
Thread: https://gitlist.dev/t/11894

## Jari Aalto, 2008-02-05 13:56

Subject: [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option
Message-ID: <d4rbzevi.fsf@blue.sea.net>
URL: https://gitlist.dev/e/d4rbzevi.fsf%40blue.sea.net

```
Honor user settable --whitespace=<control>

Signed-off-by: Jari Aalto <jari.aalto AT cante.net>
---
 git-rebase.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index bdcea0e..ec052c4 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -174,7 +174,8 @@ do
 		head_name=$(cat .dotest/head-name) &&
 		onto=$(cat .dotest/onto) &&
 		orig_head=$(cat .dotest/orig-head) &&
-		git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
+		git am $git_am_opt --resolved --3way \
+		    --resolvemsg="$RESOLVEMSG" &&
 		move_to_original_branch
 		exit
 		;;
-- 
1.5.4-rc5.GIT-dirty


-- 
Welcome to FOSS revolution: we fix and modify until it shines

```

## Junio C Hamano, 2008-02-06 02:26

Subject: Re: [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option
Message-ID: <7vmyqe6crr.fsf@gitster.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vmyqe6crr.fsf%40gitster.siamese.dyndns.org
In-Reply-To: <d4rbzevi.fsf@blue.sea.net>

```
Jari Aalto <jari.aalto@cante.net> writes:

> Honor user settable --whitespace=<control>
>
> Signed-off-by: Jari Aalto <jari.aalto AT cante.net>
> ---
>  git-rebase.sh |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index bdcea0e..ec052c4 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -174,7 +174,8 @@ do
>  		head_name=$(cat .dotest/head-name) &&
>  		onto=$(cat .dotest/onto) &&
>  		orig_head=$(cat .dotest/orig-head) &&
> -		git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
> +		git am $git_am_opt --resolved --3way \
> +		    --resolvemsg="$RESOLVEMSG" &&
>  		move_to_original_branch
>  		exit
>  		;;

Actually this is a bug in git-am.  am is supposed to remember
the original command line options.

8c31cb8 (git-am: --whitespace=x option) does it correctly, but
later 67dad68 (add -C[NUM] to git-am) broke it and other changes
inherited the breakage.

```