Skip to contentSkip to conversation

git-rebase.sh: Read $git_am_opt user setting inside --continue option

PATCH In review Jari Aalto 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore

Jari Aalto

author
#0 lore raw

PATCH 1/1 git-rebase.sh: Read $git_am_opt user setting inside --continue option

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(-)
git-rebase.sh +2 -1
index bdcea0e..ec052c4 100755
@@ -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
 		;;
Signature · 5 lines
1.5.4-rc5.GIT-dirty


-- 
Welcome to FOSS revolution: we fix and modify until it shines
#1 lore raw
Quoted 12 lines · Jari Aalto

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(-)
git-rebase.sh +0 -0
index bdcea0e..ec052c4 100755

git-rebase.sh do · line 181

Quoted 9 lines
git-rebase.sh +2 -1
@@ -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.