From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/3] rebase -i: several cleanups
Date: Tue, 26 Jun 2007 18:09:55 -0700 [thread overview]
Message-ID: <7vk5tqurrw.fsf@assigned-by-dhcp.pobox.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0706251856300.4059@racer.site> (Johannes Schindelin's message of "Mon, 25 Jun 2007 18:56:55 +0100 (BST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Support "--verbose" in addition to "-v", show short names in the list
> comment, clean up if there is nothing to do, and add several "test_ticks"
> in the test script.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> git-rebase--interactive.sh | 19 +++++++++++++++----
> t/t3404-rebase-interactive.sh | 2 ++
> 2 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index ab36572..b95fe86 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -60,6 +60,11 @@ die_with_patch () {
> die "$2"
> }
>
> +die_abort () {
> + rm -rf "$DOTEST" 2> /dev/null
> + die "$1"
> +}
Why "2>/dev/null" here?
> @@ -264,8 +269,11 @@ do
> echo $ONTO > "$DOTEST"/onto
> test t = "$VERBOSE" && : > "$DOTEST"/verbose
>
> + SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
> + SHORTHEAD=$(git rev-parse --short $HEAD)
> + SHORTONTO=$(git rev-parse --short $ONTO)
> cat > "$TODO" << EOF
> -# Rebasing $UPSTREAM..$HEAD onto $ONTO
> +# Rebasing $SHORTUPSTREAM)..$SHORTHEAD onto $SHORTONTO
What is this close-paren about? Is it a typo?
next prev parent reply other threads:[~2007-06-27 1:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-25 17:56 [PATCH 1/3] rebase -i: several cleanups Johannes Schindelin
2007-06-27 1:09 ` Junio C Hamano [this message]
2007-06-27 1:17 ` Johannes Schindelin
2007-06-27 1:57 ` Junio C Hamano
2007-06-27 10:33 ` Johannes Schindelin
2007-06-27 2:00 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vk5tqurrw.fsf@assigned-by-dhcp.pobox.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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