Re: [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:10
Jari Aalto [off-list ref] writes:
quoted hunk
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.