From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sebastian Schuberth <sschuberth@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 1/3] t7504: document regression: reword no longer calls commit-msg
Date: Thu, 23 Mar 2017 15:41:11 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1703231539410.3767@virtualbox> (raw)
In-Reply-To: <xmqqinn1kwo6.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Wed, 22 Mar 2017, Junio C Hamano wrote:
> Sebastian Schuberth <sschuberth@gmail.com> writes:
>
> > On Wed, Mar 22, 2017 at 4:01 PM, Johannes Schindelin
> > <johannes.schindelin@gmx.de> wrote:
> >
> >> Noticed by Sebastian Schuberth.
> >
> > Thanks for working on the fix.
> >
> >> +# set up fake editor to replace `pick` by `reword`
> >> +cat > reword-editor <<'EOF'
> >> +#!/bin/sh
> >> +mv "$1" "$1".bup &&
> >> +sed 's/^pick/reword/' <"$1".bup >"$1"
> >> +EOF
> >
> > Maybe use
> >
> > sed -i 's/^pick/reword/' "$1"
> >
> > here to avoid renaming the input file? Not sure how portable -i for
> > sed is, though. Otherwise, maybe remove the file "$1".bup afterwards
> > to be clean?
>
> "-i" is GNUism and it is a good idea to avoid it, but cleaning after
> itself may be worth doing to avoid contaminating the working tree.
This script is only used as *sequence* editor, i.e. for
.git/merge-rebase/git-rebase-todo. As such, I find it valuable to have the
original version in the same directory, and the file is cleaned up upon
success by the `git rebase -i` command anyway.
In that light, I am sure you agree that the current code is fine.
Ciao,
Dscho
next prev parent reply other threads:[~2017-03-23 14:41 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-22 15:01 [PATCH 0/3] rebase -i (reword): call the commit-msg hook again Johannes Schindelin
2017-03-22 15:01 ` [PATCH 1/3] t7504: document regression: reword no longer calls commit-msg Johannes Schindelin
2017-03-22 15:18 ` Sebastian Schuberth
2017-03-22 16:09 ` Johannes Schindelin
2017-03-22 18:15 ` Junio C Hamano
2017-03-23 14:43 ` Johannes Schindelin
2017-03-23 14:55 ` Sebastian Schuberth
2017-03-23 15:52 ` Johannes Schindelin
2017-03-22 18:12 ` Junio C Hamano
2017-03-23 14:41 ` Johannes Schindelin [this message]
2017-03-22 15:01 ` [PATCH 2/3] sequencer: make commit options more extensible Johannes Schindelin
2017-03-22 18:21 ` Junio C Hamano
2017-03-23 14:39 ` Johannes Schindelin
2017-03-23 16:04 ` Junio C Hamano
2017-03-22 15:02 ` [PATCH 3/3] sequencer: allow the commit-msg hooks to run during a `reword` Johannes Schindelin
2017-03-22 18:43 ` Junio C Hamano
2017-03-23 15:49 ` Johannes Schindelin
2017-03-23 16:07 ` [PATCH v2 0/3] rebase -i (reword): call the commit-msg hook again Johannes Schindelin
2017-03-23 16:07 ` [PATCH v2 1/3] t7504: document regression: reword no longer calls commit-msg Johannes Schindelin
2017-03-23 16:07 ` [PATCH v2 2/3] sequencer: make commit options more extensible Johannes Schindelin
2017-03-24 1:01 ` Junio C Hamano
2017-03-25 0:01 ` Johannes Schindelin
2017-03-27 0:55 ` Junio C Hamano
2017-03-27 21:03 ` Junio C Hamano
2017-03-29 12:49 ` Johannes Schindelin
2017-03-23 16:07 ` [PATCH v2 3/3] sequencer: allow the commit-msg hooks to run during a `reword` Johannes Schindelin
2017-03-23 16:51 ` Junio C Hamano
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=alpine.DEB.2.20.1703231539410.3767@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sschuberth@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).