git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Paul Tan <pyokagan@gmail.com>
Cc: git@vger.kernel.org,
	Johannes Schindelin <johannes.schindelin@gmx.de>,
	Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH v5 00/44] Make git-am a builtin
Date: Tue, 07 Jul 2015 11:52:23 -0700	[thread overview]
Message-ID: <xmqqvbdv3imw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1436278862-2638-1-git-send-email-pyokagan@gmail.com> (Paul Tan's message of "Tue, 7 Jul 2015 22:20:18 +0800")

Paul Tan <pyokagan@gmail.com> writes:

> This patch series depends on pt/pull-builtin.
>
> This is a re-roll of [v4]. Thanks Torsten, Stefan, Junio for the reviews last
> round. Interdiff below.
>
> Previous versions:
>
> [WIP v1] http://thread.gmane.org/gmane.comp.version-control.git/270048
> [WIP v2] http://thread.gmane.org/gmane.comp.version-control.git/271381
> [WIP v3] http://thread.gmane.org/gmane.comp.version-control.git/271967
> [v4] http://thread.gmane.org/gmane.comp.version-control.git/272876
>
> git-am is a commonly used command for applying a series of patches from a
> mailbox to the current branch. Currently, it is implemented by the shell script
> git-am.sh. However, compared to C, shell scripts have certain deficiencies:
> they need to spawn a lot of processes, introduce a lot of dependencies and
> cannot take advantage of git's internal caches.
>
> This patch series rewrites git-am.sh into optimized C builtin/am.c, and is
> part of my GSoC project to rewrite git-pull and git-am into C builtins[1].
>
> [1] https://gist.github.com/pyokagan/1b7b0d1f4dab6ba3cef1

Is it really a rewrite into "optimized C", or just "C"?  I suspect
it is the latter.

This seems to apply cleanly to 'master' but fails to compile, as it
depends on some new stuff that are not even in 'next' yet, e.g.
argv_array_pushv() that is from pt/pull-builtin, and it does not
apply cleanly on top of that branch, either.

I'll see what's the cleanest way to queue this would be.  Perhaps
merge pt/builtin-pull on a copy of 'master' and then apply these, or
something like that.

Thanks.

  parent reply	other threads:[~2015-07-07 18:53 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-07 14:20 [PATCH v5 00/44] Make git-am a builtin Paul Tan
2015-07-07 14:20 ` [PATCH v5 01/44] wrapper: implement xopen() Paul Tan
2015-07-07 14:20 ` [PATCH v5 02/44] wrapper: implement xfopen() Paul Tan
2015-07-07 14:20 ` [PATCH v5 03/44] builtin-am: implement skeletal builtin am Paul Tan
2015-07-07 14:20 ` [PATCH v5 04/44] builtin-am: implement patch queue mechanism Paul Tan
2015-07-07 14:20 ` [PATCH v5 05/44] builtin-am: split out mbox/maildir patches with git-mailsplit Paul Tan
2015-07-07 14:20 ` [PATCH v5 06/44] builtin-am: auto-detect mbox patches Paul Tan
2015-07-07 14:20 ` [PATCH v5 07/44] builtin-am: extract patch and commit info with git-mailinfo Paul Tan
2015-07-07 14:20 ` [PATCH v5 08/44] builtin-am: apply patch with git-apply Paul Tan
2015-07-07 14:20 ` [PATCH v5 09/44] builtin-am: implement committing applied patch Paul Tan
2015-07-07 14:20 ` [PATCH v5 10/44] builtin-am: refuse to apply patches if index is dirty Paul Tan
2015-07-07 14:20 ` [PATCH v5 11/44] builtin-am: implement --resolved/--continue Paul Tan
2015-07-07 14:20 ` [PATCH v5 12/44] builtin-am: implement --skip Paul Tan
2015-07-13 19:05   ` Stefan Beller
2015-07-14  9:34     ` Paul Tan
2015-07-14 16:54       ` Stefan Beller
2015-07-18 15:22         ` Paul Tan
2015-07-07 14:20 ` [PATCH v5 13/44] builtin-am: implement --abort Paul Tan
2015-07-07 14:20 ` [PATCH v5 14/44] builtin-am: reject patches when there's a session in progress Paul Tan
2015-07-07 14:20 ` [PATCH v5 15/44] builtin-am: implement -q/--quiet Paul Tan
2015-07-07 14:20 ` [PATCH v5 16/44] builtin-am: exit with user friendly message on failure Paul Tan
2015-07-07 14:20 ` [PATCH v5 17/44] builtin-am: implement -s/--signoff Paul Tan
2015-07-07 14:20 ` [PATCH v5 18/44] cache-tree: introduce write_index_as_tree() Paul Tan
2015-07-07 20:10   ` Junio C Hamano
2015-07-07 14:20 ` [PATCH v5 19/44] builtin-am: implement --3way, am.threeWay Paul Tan
2015-07-07 20:14   ` Junio C Hamano
2015-07-14  9:32     ` Paul Tan
2015-07-07 14:20 ` [PATCH v5 20/44] builtin-am: implement --rebasing mode Paul Tan
2015-07-07 14:20 ` [PATCH v5 21/44] builtin-am: bypass git-mailinfo when --rebasing Paul Tan
2015-07-07 14:20 ` [PATCH v5 22/44] builtin-am: handle stray state directory Paul Tan
2015-07-07 14:20 ` [PATCH v5 23/44] builtin-am: implement -u/--utf8 Paul Tan
2015-07-07 14:20 ` [PATCH v5 24/44] builtin-am: implement -k/--keep, --keep-non-patch Paul Tan
2015-07-07 14:20 ` [PATCH v5 25/44] builtin-am: implement --[no-]message-id, am.messageid Paul Tan
2015-07-07 14:20 ` [PATCH v5 26/44] builtin-am: support --keep-cr, am.keepcr Paul Tan
2015-07-07 14:20 ` [PATCH v5 27/44] builtin-am: implement --[no-]scissors Paul Tan
2015-07-07 14:20 ` [PATCH v5 28/44] builtin-am: pass git-apply's options to git-apply Paul Tan
2015-07-07 14:20 ` [PATCH v5 29/44] builtin-am: implement --ignore-date Paul Tan
2015-07-07 14:20 ` [PATCH v5 30/44] builtin-am: implement --committer-date-is-author-date Paul Tan
2015-07-07 14:20 ` [PATCH v5 31/44] builtin-am: implement -S/--gpg-sign, commit.gpgsign Paul Tan
2015-07-07 14:20 ` [PATCH v5 32/44] builtin-am: invoke post-rewrite hook Paul Tan
2015-07-07 14:20 ` [PATCH v5 33/44] builtin-am: support automatic notes copying Paul Tan
2015-07-07 14:20 ` [PATCH v5 34/44] builtin-am: invoke applypatch-msg hook Paul Tan
2015-07-07 14:20 ` [PATCH v5 35/44] builtin-am: invoke pre-applypatch hook Paul Tan
2015-07-07 14:20 ` [PATCH v5 36/44] builtin-am: invoke post-applypatch hook Paul Tan
2015-07-07 14:20 ` [PATCH v5 37/44] builtin-am: rerere support Paul Tan
2015-07-07 14:20 ` [PATCH v5 38/44] builtin-am: support and auto-detect StGit patches Paul Tan
2015-07-07 14:20 ` [PATCH v5 39/44] builtin-am: support and auto-detect StGit series files Paul Tan
2015-07-07 14:20 ` [PATCH v5 40/44] builtin-am: support and auto-detect mercurial patches Paul Tan
2015-07-07 14:20 ` [PATCH v5 41/44] builtin-am: implement -i/--interactive Paul Tan
2015-07-07 14:21 ` [PATCH v5 42/44] builtin-am: implement legacy -b/--binary option Paul Tan
2015-07-07 14:21 ` [PATCH v5 43/44] builtin-am: check for valid committer ident Paul Tan
2015-07-07 14:21 ` [PATCH v5 44/44] builtin-am: remove redirection to git-am.sh Paul Tan
2015-07-07 18:52 ` Junio C Hamano [this message]
2015-07-07 19:25   ` [PATCH v5 00/44] Make git-am a builtin Paul Tan
2015-07-08  7:31 ` Junio C Hamano
2015-07-08  7:44   ` Paul Tan
2015-07-08  7:48   ` Junio C Hamano
2015-07-08  8:19     ` Paul Tan
2015-07-09  6:00       ` Junio C Hamano
2015-07-12 12:29         ` Paul Tan
2015-07-12 17:32           ` Junio C Hamano
2015-07-13 22:31 ` Junio C Hamano
2015-07-14 10:08   ` Paul Tan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqvbdv3imw.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=pyokagan@gmail.com \
    --cc=sbeller@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).