Re: What's cooking in git.git (Aug 2015, #01; Mon, 3)

From: Paul Tan <pyokagan@gmail.com>
Date: Aug 4, 2015, 00:16 UTC
Message-ID: <CACRoPnRj4apVat2oWVHvUgWdLp6RJZsWw-s=juB-Sdc3dL30ng@mail.gmail.com>
In-Reply-To: <xmqq38006mod.fsf@gitster.dls.corp.google.com>

On Tue, Aug 4, 2015 at 6:18 AM, Junio C Hamano <gitster@pobox.com> wrote:

>  - I think pt/am-builtin is more or less ready, but the fix to the
>    issue that options given to 'git am' when restarting were
>    rejected must be queued on that topic before we can start
>    thinking of merging it to 'master' for the next release.

Yeah, sorry for the lack of updates, but I'm working on it[1]. I've added a patch that adds stdin pty support to test_terminal, and made --signoff work when resuming.

However, it turns out that --keep, --message-id and --scissors do not work as well, as they apply to the mail-parsing stage (git-mailinfo), which comes before the patch application stage. It's tricky, as their functionality is locked inside builtin/mailinfo.c. :-/

I'm thinking about leaving them broken for now to push this patch series forward, until the future where the git-mailinfo functionality gets moved into libgit.a or something so we can access the individual functions directly and work something out.

Will send a re-roll once I look over the patches with a fresh set of eyes.

[1] https://github.com/pyokagan/git/compare/pt/builtin-am...pt/am-resume-override-opts

Thanks, Paul