From: Phillip Wood Date: Mon, 17 Jul 2023 15:39:02 GMT Subject: Re: [PATCH v2 2/6] rebase -i: remove patch file after conflict resolution Message-ID: In-Reply-To: On 14/07/2023 17:51, Junio C Hamano wrote: > Phillip Wood writes: > >> On 21/06/2023 21:14, Glen Choo wrote: >>> "Phillip Wood via GitGitGadget" 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, sorry it has taken so long, I've been struggling to find time to work on this but hopefully will have a new version ready in the next couple of weeks Best Wishes Phillip > Thanks.