| Message ID | c64984e146e509a743c9adc7b61bf7b274103cf9.1576868036.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rebase am fixes | expand |
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Elijah Newren <newren@gmail.com> > > This was an error introduced in the conversion from shell in commit > 21853626eac5 ("built-in rebase: call `git am` directly", 2019-01-18), > which was noticed by a random browsing of the code. Wow, thanks. This probably indicates that nobody uses "rebase --signoff" in real life (i.e. where correct signed-off-by line matters). But still the bug is worth fixing. > > Signed-off-by: Elijah Newren <newren@gmail.com> > --- > builtin/rebase.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index ddf33bc9d4..e354ec84bb 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -706,7 +706,7 @@ static int rebase_write_basic_state(struct rebase_options *opts) > write_file(state_dir_path("gpg_sign_opt", opts), "%s", > opts->gpg_sign_opt); > if (opts->signoff) > - write_file(state_dir_path("strategy", opts), "--signoff"); > + write_file(state_dir_path("signoff", opts), "--signoff"); > > return 0; > }
Hi, On Fri, 20 Dec 2019, Junio C Hamano wrote: > "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes: > > > From: Elijah Newren <newren@gmail.com> > > > > This was an error introduced in the conversion from shell in commit > > 21853626eac5 ("built-in rebase: call `git am` directly", 2019-01-18), > > which was noticed by a random browsing of the code. > > Wow, thanks. Oy. Thanks for fixing my bug, Dscho > > This probably indicates that nobody uses "rebase --signoff" in real > life (i.e. where correct signed-off-by line matters). But still the > bug is worth fixing. > > > > > Signed-off-by: Elijah Newren <newren@gmail.com> > > --- > > builtin/rebase.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/builtin/rebase.c b/builtin/rebase.c > > index ddf33bc9d4..e354ec84bb 100644 > > --- a/builtin/rebase.c > > +++ b/builtin/rebase.c > > @@ -706,7 +706,7 @@ static int rebase_write_basic_state(struct rebase_options *opts) > > write_file(state_dir_path("gpg_sign_opt", opts), "%s", > > opts->gpg_sign_opt); > > if (opts->signoff) > > - write_file(state_dir_path("strategy", opts), "--signoff"); > > + write_file(state_dir_path("signoff", opts), "--signoff"); > > > > return 0; > > } >
diff --git a/builtin/rebase.c b/builtin/rebase.c index ddf33bc9d4..e354ec84bb 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -706,7 +706,7 @@ static int rebase_write_basic_state(struct rebase_options *opts) write_file(state_dir_path("gpg_sign_opt", opts), "%s", opts->gpg_sign_opt); if (opts->signoff) - write_file(state_dir_path("strategy", opts), "--signoff"); + write_file(state_dir_path("signoff", opts), "--signoff"); return 0; }