Re: [PATCH v4 31/45] rebase: trivial cleanup

2013-06-11 Thread Junio C Hamano
Fredrik Gustafsson iv...@iveqy.com writes: Here we have two sh-scripts (git rebase and git am) interacting with each other. Both uses GIT_QUIET, Correct. so if GIT_QUIET already is set by the caller (git rebase) the callee doesn't have to set it to. Incorrect. git rebase invokes git am,

Re: [PATCH v4 31/45] rebase: trivial cleanup

2013-06-11 Thread Fredrik Gustafsson
On Tue, Jun 11, 2013 at 12:09:32PM -0500, Felipe Contreras wrote: It's not removed. It's simply moved. Sorry about that, I wasn't paying enough attention. But why are you moving it? All other arguments to git am is set in git-rebase.sh, why just set -q just before the invokation in

Re: [PATCH v4 31/45] rebase: trivial cleanup

2013-06-11 Thread Felipe Contreras
On Tue, Jun 11, 2013 at 12:24 PM, Fredrik Gustafsson iv...@iveqy.com wrote: On Tue, Jun 11, 2013 at 12:09:32PM -0500, Felipe Contreras wrote: It's not removed. It's simply moved. Sorry about that, I wasn't paying enough attention. But why are you moving it? All other arguments to git am is

Re: [PATCH v4 31/45] rebase: trivial cleanup

2013-06-11 Thread Fredrik Gustafsson
On Tue, Jun 11, 2013 at 12:26:42PM -0500, Felipe Contreras wrote: On Tue, Jun 11, 2013 at 12:24 PM, Fredrik Gustafsson iv...@iveqy.com wrote: On Tue, Jun 11, 2013 at 12:09:32PM -0500, Felipe Contreras wrote: It's not removed. It's simply moved. Sorry about that, I wasn't paying enough

Re: [PATCH v4 31/45] rebase: trivial cleanup

2013-06-11 Thread Felipe Contreras
On Tue, Jun 11, 2013 at 12:41 PM, Fredrik Gustafsson iv...@iveqy.com wrote: On Tue, Jun 11, 2013 at 12:26:42PM -0500, Felipe Contreras wrote: On Tue, Jun 11, 2013 at 12:24 PM, Fredrik Gustafsson iv...@iveqy.com wrote: On Tue, Jun 11, 2013 at 12:09:32PM -0500, Felipe Contreras wrote: It's not

[PATCH v4 31/45] rebase: trivial cleanup

2013-06-09 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--am.sh | 1 + git-rebase.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 6460028..2ce7570 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@

Re: [PATCH v4 31/45] rebase: trivial cleanup

2013-06-09 Thread Fredrik Gustafsson
On Sun, Jun 09, 2013 at 11:40:43AM -0500, Felipe Contreras wrote: - git_am_opt=$git_am_opt -q This one makes me wonder a bit. I'm not sure about how this works in git, so I would appriciate if someone can explain. I might also have misunderstood something. Here we have two