* [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option
@ 2008-02-05 13:56 Jari Aalto
2008-02-06 2:26 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Jari Aalto @ 2008-02-05 13:56 UTC (permalink / raw)
To: git
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option
2008-02-05 13:56 [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option Jari Aalto
@ 2008-02-06 2:26 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2008-02-06 2:26 UTC (permalink / raw)
To: Jari Aalto; +Cc: git
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-06 2:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-05 13:56 [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option Jari Aalto
2008-02-06 2:26 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).