Hi Junio, Le 31/07/2018 à 17:23, Junio C Hamano a écrit : > Alban Gruin <alban.gr...@gmail.com> writes: > >> As pointed out by SZEDER Gábor, git-rebase.sh wrote to to 'quiet' with >> an `echo`: >> >> echo "$GIT_QUIET" > "$state_dir/quiet" >> >> This mean that even if $GIT_QUIET is empty, a newline is written to >> quiet. The rewrite of write_basic_state() changed this behaviour, which >> could lead to problems. This patch changes the rewritten version to >> behave like the shell version. >> >> Signed-off-by: Alban Gruin <alban.gr...@gmail.com> >> --- >> Hi Junio, could you apply this patch on top of ag/rebase-i-in-c, please? > > Hmph, from reading your other message > > https://public-inbox.org/git/dce8c99b-51e9-4ed1-8ae4-28049cb6e...@gmail.com/ > > I got an impression that a rerolled version is coming anyway. Is > this fix so urgent that it needs tobe squashed in in the meantime > and cannot wait? >
I wanted to reroll it first, but the only changes would have been this fix and Ramsay’s patch. I was advised to send a fixup! patch instead. I can send a reroll if you want, but it won’t have any more changes. Cheers, Alban >> >> sequencer.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/sequencer.c b/sequencer.c >> index d257903db0..0d41e82953 100644 >> --- a/sequencer.c >> +++ b/sequencer.c >> @@ -2332,7 +2332,7 @@ int write_basic_state(struct replay_opts *opts, const >> char *head_name, >> if (quiet) >> write_file(rebase_path_quiet(), "%s\n", quiet); >> else >> - write_file(rebase_path_quiet(), ""); >> + write_file(rebase_path_quiet(), "\n"); >> >> if (opts->verbose) >> write_file(rebase_path_verbose(), "");
