From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 0/4] Let the builtin rebase call the git am command directly
Date: Fri, 18 Jan 2019 10:06:03 -0800 [thread overview]
Message-ID: <xmqqef99lu2c.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <pull.24.v2.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Fri, 18 Jan 2019 07:09:23 -0800 (PST)")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> Especially on Windows, where Unix shell scripting is a foreign endeavor, and
> an expensive one at that, we really want to avoid running through the Bash.
>
> This not only makes everything faster, but also more robust, as the Bash we
> use on Windows relies on a derivative of the Cygwin runtime, which in turn
> has to jump through a couple of hoops that are sometimes a little too tricky
> to make things work. Read: the less we rely on Unix shell scripting, the
> more likely Windows users will be able to enjoy our software.
>
> Changes since v1:
>
> * Rebased on top of master to avoid merge conflicts.
I do not appreciate this very much.
We already have a good resolution prepared when merging this to
either 'next' or 'master', which also resolves conflict with the
other topic that requires this topic to add "--topo-order" in its
call. Rebasing series means invalidating the previous work recorded
in rerere.
side note. The rerere database entry can be recovered from
master..pu with contrib/rerere-train.sh).
> * Adjusted the commit message talking about double entries, to clarify that
> it talks about HEAD's reflog.
Good.
> * Replaced a misleading action parameter "checkout" for the reset_head()
> function by the empty string: we do not check out here, we just update
> the refs, and certainly do not want any checkout functionality (such as
> hooks) to be involved.
OK.
> * Reused a just-prepared refs_only variable instead of repeating the value
> assigned to it.
OK.
> * Fixed a stale comment about the shell variable "$upstream" (which should
> have been negated to begin with).
> * Fixed error messages when files could not be opened.
Good.
Will take a look. Thanks.
next prev parent reply other threads:[~2019-01-18 18:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-21 13:17 [PATCH 0/4] Let the builtin rebase call the git am command directly Johannes Schindelin via GitGitGadget
2018-12-21 13:17 ` [PATCH 1/4] rebase: move `reset_head()` into a better spot Johannes Schindelin via GitGitGadget
2019-01-04 18:39 ` Junio C Hamano
2018-12-21 13:17 ` [PATCH 2/4] rebase: avoid double reflog entry when switching branches Johannes Schindelin via GitGitGadget
2019-01-04 18:38 ` Junio C Hamano
2019-01-18 14:18 ` Johannes Schindelin
2018-12-21 13:17 ` [PATCH 4/4] built-in rebase: call `git am` directly Johannes Schindelin via GitGitGadget
2019-01-04 18:38 ` Junio C Hamano
2019-01-18 14:15 ` Johannes Schindelin
2019-01-18 17:59 ` Junio C Hamano
2019-01-18 18:14 ` Johannes Schindelin
2019-01-04 23:19 ` Junio C Hamano
2019-01-07 17:19 ` Junio C Hamano
2018-12-21 13:17 ` [PATCH 3/4] rebase: teach `reset_head()` to optionally skip the worktree Johannes Schindelin via GitGitGadget
2019-01-04 18:38 ` Junio C Hamano
2019-01-04 18:40 ` Junio C Hamano
2019-01-18 14:18 ` Johannes Schindelin
2019-01-18 15:09 ` [PATCH v2 0/4] Let the builtin rebase call the git am command directly Johannes Schindelin via GitGitGadget
2019-01-18 15:09 ` [PATCH v2 1/4] rebase: move `reset_head()` into a better spot Johannes Schindelin via GitGitGadget
2019-01-18 15:09 ` [PATCH v2 2/4] rebase: avoid double reflog entry when switching branches Johannes Schindelin via GitGitGadget
2019-01-18 15:09 ` [PATCH v2 3/4] rebase: teach `reset_head()` to optionally skip the worktree Johannes Schindelin via GitGitGadget
2019-01-18 15:09 ` [PATCH v2 4/4] built-in rebase: call `git am` directly Johannes Schindelin via GitGitGadget
2019-01-26 21:13 ` Alban Gruin
2019-01-29 9:46 ` Johannes Schindelin
2019-01-18 18:06 ` Junio C Hamano [this message]
2019-01-18 20:13 ` [PATCH v2 0/4] Let the builtin rebase call the git am command directly Junio C Hamano
2019-01-18 20:31 ` Johannes Schindelin
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=xmqqef99lu2c.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.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).