From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Dmitry Potapov <dpotapov@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] rebase -i: commit when continuing after "edit"
Date: Tue, 25 Sep 2007 14:50:25 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0709251439070.28395@racer.site> (raw)
In-Reply-To: <46F90C95.5060903@viscovery.net>
Hi,
On Tue, 25 Sep 2007, Johannes Sixt wrote:
> Johannes Schindelin schrieb:
> > On Mon, 24 Sep 2007, Junio C Hamano wrote:
> > > > do_next () {
> > > > test -f "$DOTEST"/message && rm "$DOTEST"/message
> > > > test -f "$DOTEST"/author-script && rm "$DOTEST"/author-script
> > > > + test -f "$DOTEST"/amend && rm "$DOTEST"/amend
> > > As you do not check the error from "rm", how are these different from rm
> > > -f "$DOTEST/frotz"?
> >
> > The difference: the user will not see many irritating error messages.
> >
> > I changed this code to use a newly written function "remove_if_exists",
> > which die()s if the file exists and could not be removed.
>
> Why? rm -f does nothing if the file does not exist, and fails if it cannot
> remove an existing file. It all boils down to:
>
> rm -f "$DOTEST"/message "$DOTEST"/author-script \
> "$DOTEST"/amend || exit
You're completely right. I somehow assumed that it would print an
annoying message, but I was wrong.
BTW I am continually amazed at the ease of rebase -i to fix issues like
these in a patch series. Thanks Eric!
> > > > # This is like --amend, but with a different message
> > > > eval "$author_script"
> > > > export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
> > > > GIT_AUTHOR_DATE
> > > > $USE_OUTPUT git commit -F "$MSG" $EDIT_COMMIT
> > > > ;;
> > > The "export" here makes me somewhat nervous -- no chance these
> > > leak into the next round?
> >
> > I am somewhat wary: I get quoting wrong all the time. Would
> >
> > $USE_OUTPUT $author_script git commit -F "$MSG" $EDIT_COMMIT
> >
> > work? I have the slight suspicion that it would not, since
> >
> > eval "$author_script"
> >
> > needs extra quoting in $author_script, no?
>
> How about:
>
> eval "$author_script"
> GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
> GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
> GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
> $USE_OUTPUT git commit -F "$MSG" $EDIT_COMMIT
>
> and if you dislike that, put the two questionable lines in parenthesis.
That looks ugly. I'd rather have something like
eval "$USE_OUTPUT $author_script git commit -F \"$MSG\" $EDIT_COMMIT"
but I'm not quite certain if that is enough, what with the funny
characters people put into path names these days ($MSG points to
"$DOTEST"/message).
BTW I just realised that the _same_ issue should have occurred in the
"squash" case, but there I _forgot_ to export the environment variables.
Ciao,
Dscho
next prev parent reply other threads:[~2007-09-25 13:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-23 22:45 git-rebase--interactive needs a better message Dmitry Potapov
2007-09-23 23:56 ` Johannes Schindelin
2007-09-24 0:29 ` [PATCH] rebase -i: commit when continuing after "edit" Johannes Schindelin
2007-09-24 9:11 ` Dmitry Potapov
2007-09-25 5:37 ` Junio C Hamano
2007-09-25 12:32 ` Johannes Schindelin
2007-09-25 13:26 ` Johannes Sixt
2007-09-25 13:50 ` Johannes Schindelin [this message]
2007-09-25 14:17 ` Johannes Sixt
2007-09-25 14:31 ` Johannes Schindelin
2007-09-25 15:01 ` Johannes Sixt
2007-09-25 15:16 ` Johannes Schindelin
2007-09-25 14:46 ` David Kastrup
2007-09-25 15:54 ` Johannes Sixt
2007-09-25 16:04 ` David Kastrup
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=Pine.LNX.4.64.0709251439070.28395@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/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).