From: Jonathan Nieder <jrnieder@gmail.com>
To: Kevin Ballard <kevin@sb.org>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Yann Dirson <dirson@bertin.fr>, Eric Raible <raible@nextest.com>
Subject: Re: [PATCHv3] git-rebase--interactive.sh: extend "edit" command to be more useful
Date: Fri, 3 Dec 2010 02:55:28 -0600 [thread overview]
Message-ID: <20101203085528.GE18202@burratino> (raw)
In-Reply-To: <048EACFB-2038-4D49-B6C3-7E7354F62171@sb.org>
Kevin Ballard wrote:
> On Dec 3, 2010, at 12:06 AM, Jonathan Nieder wrote:
>> Maybe something like
>>
>> rebase-i: treat "edit" without sha1 as a request to amend previous commit
>>
>> would make the meaning more obvious in a shortlog.
>
> That seems a bit misleading, though. This command really has nothing to do with
> amending the previous commit.
Okay, maybe
rebase-i: extend "edit" to allow stopping without a commit to amend
Or something else entirely; I only meant that "to be more useful" is
a bit vague (it could be cut out without loss of meaning).
>> Maybe this can be done without relying on details of --pretty=oneline
>> format?
>>
>> sha1=$(git rev-parse --short HEAD)
>> rest=$(git show -s --format=%s HEAD)
>
> Does this not similarly assume that rev-parse and show will not fail? Or was
> the above comment only meant to point out this potential issue without
> suggesting that it needed to be fixed?
Yes, that's right. The exit status from rev-list is ignored
throughout the script; making that more robust is a separate topic.
BTW this suggestion about avoiding --pretty=oneline was nonsense ---
the output format from
git rev-list --pretty=oneline
is guaranteed to stay the same because rev-list is plumbing. Sorry
for the noise.
Good night,
Jonathan
next prev parent reply other threads:[~2010-12-03 8:56 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-04 5:17 [PATCH] git-rebase--interactive.sh: Add new command "shell" Kevin Ballard
2010-11-04 5:22 ` Kevin Ballard
2010-11-04 8:42 ` Matthieu Moy
2010-11-04 8:53 ` Kevin Ballard
2010-11-04 9:23 ` Ævar Arnfjörð Bjarmason
2010-11-04 9:25 ` Kevin Ballard
2010-11-04 9:27 ` Ævar Arnfjörð Bjarmason
2010-11-04 10:24 ` Johannes Sixt
2010-11-04 9:36 ` Erik Faye-Lund
2010-11-04 9:43 ` Kevin Ballard
2010-11-04 10:25 ` Yann Dirson
2010-11-04 10:40 ` Erik Faye-Lund
2010-11-04 17:04 ` Eric Raible
2010-11-04 17:34 ` Matthieu Moy
2010-11-04 17:43 ` Eric Raible
2010-11-04 18:10 ` Jonathan Nieder
2010-11-04 20:53 ` Yann Dirson
2010-11-04 21:05 ` Eric Raible
2010-11-04 22:01 ` [PATCHv2] git-rebase--interactive.sh: extend "edit" command to be more useful Kevin Ballard
2010-11-04 21:33 ` [PATCH] git-rebase--interactive.sh: Add new command "shell" Kevin Ballard
2010-11-05 7:33 ` Johannes Sixt
2010-11-05 8:39 ` Kevin Ballard
2010-11-08 18:31 ` Junio C Hamano
2010-11-08 21:49 ` Kevin Ballard
2010-11-08 22:29 ` Yann Dirson
2010-11-10 1:42 ` Jonathan Nieder
2010-11-10 1:46 ` Kevin Ballard
2010-11-10 1:56 ` Jonathan Nieder
2010-11-10 7:43 ` Yann Dirson
2010-11-10 16:00 ` Matthieu Moy
2010-11-10 1:53 ` Jonathan Nieder
2010-11-10 2:14 ` Kevin Ballard
2010-11-24 20:19 ` [PATCHv3] git-rebase--interactive.sh: extend "edit" command to be more useful Kevin Ballard
2010-12-03 8:06 ` Jonathan Nieder
2010-12-03 8:16 ` Kevin Ballard
2010-12-03 8:55 ` Jonathan Nieder [this message]
2010-12-03 9:55 ` Johannes Sixt
2010-12-03 10:00 ` Jonathan Nieder
2010-12-03 10:14 ` Kevin Ballard
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101203085528.GE18202@burratino \
--to=jrnieder@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=dirson@bertin.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kevin@sb.org \
--cc=raible@nextest.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.
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 NNTP newsgroup(s).