From: Junio C Hamano <gitster@pobox.com>
To: Pierre Habouzit <madcoder@debian.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Avoid spurious error messages on error mistakes.
Date: Tue, 13 Jan 2009 00:20:44 -0800 [thread overview]
Message-ID: <7vk58zd3c3.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1231801776-20724-1-git-send-email-madcoder@debian.org> (Pierre Habouzit's message of "Tue, 13 Jan 2009 00:09:36 +0100")
Pierre Habouzit <madcoder@debian.org> writes:
> Prior to that, if the user chose "squash" as a first action, the stderr
> looked like:
>
> grep: /home/madcoder/dev/scm/git/.git/rebase-merge/done: No such file or directory
> Cannot 'squash' without a previous commit
>
> Now the first line is gone.
>
> Signed-off-by: Pierre Habouzit <madcoder@debian.org>
> ---
> git-rebase--interactive.sh | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index c8b0861..8ed2244 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -349,7 +349,7 @@ do_next () {
> squash|s)
> comment_for_reflog squash
>
> - has_action "$DONE" ||
> + test -f "$DONE" && has_action "$DONE" ||
> die "Cannot 'squash' without a previous commit"
>
> mark_action_done
> --
> 1.6.1.161.g5e07b.dirty
Make sense. Will apply to maint.
prev parent reply other threads:[~2009-01-13 8:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-12 19:13 rebase-merge/done: No such file or directory jidanni
2009-01-12 22:47 ` Johannes Schindelin
2009-01-12 23:02 ` Adeodato Simó
2009-01-12 23:09 ` [PATCH] Avoid spurious error messages on error mistakes Pierre Habouzit
2009-01-13 8:20 ` Junio C Hamano [this message]
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=7vk58zd3c3.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=madcoder@debian.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;
as well as URLs for NNTP newsgroup(s).