Re: [PATCH v2 2/6] rebase -i: remove patch file after conflict resolution
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 14, 2023, 16:51 UTC
- Message-ID
- <xmqq4jm6qvvd.fsf@gitster.g>
- In-Reply-To
- <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 18 quoted lines
> On 21/06/2023 21:14, Glen Choo wrote: >> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes: >> >>> @@ -3490,7 +3495,6 @@ static int make_patch(struct repository *r, >>> return -1; >>> res |= write_rebase_head(&commit->object.oid); >>> - strbuf_addf(&buf, "%s/patch", get_dir(opts)); >>> memset(&log_tree_opt, 0, sizeof(log_tree_opt)); >>> repo_init_revisions(r, &log_tree_opt, NULL); >>> log_tree_opt.abbrev = 0; >> I was checking to see if we could remove buf or whether we are >> reusing >> it for unrelated reasons (which is a common Git-ism). We can't remove it >> because we reuse it, however... > > I had a look at that and we're using it to construct a path that we > should obtain by calling rebase_path_message() - I'll add a fix when I > re-roll.
Wow, a patch from April commented in June and responded in July ;-).
I'll salvage the topic from the "will discard" bin and mark it again as "Expecting a reroll" in my draft of the next "What's cooking" report.
Thanks.