From: Junio C Hamano <gitster@pobox.com>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Improve error output of git-rebase without any arguments
Date: Sat, 16 Aug 2008 19:37:19 -0700 [thread overview]
Message-ID: <7v1w0ocqow.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1218932781-30475-1-git-send-email-s-beyer@gmx.net> (Stephan Beyer's message of "Sun, 17 Aug 2008 02:26:21 +0200")
Stephan Beyer <s-beyer@gmx.net> writes:
> Stumbled across this today and looks for me like
> a patch for 1.6.0 :-)
Is presense of "$dotest" or "$GIT_DIR/rebase-apply" a _sure sign_ that
allows you to say "A rebase is in progress" with confidence?
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 412e135..fe669ad 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -146,6 +146,12 @@ is_interactive () {
>
> is_interactive "$@" && exec git-rebase--interactive "$@"
>
> +if test $# -eq 0
> +then
> + test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage
> + die 'A rebase is in progress, try --continue, --skip or --abort.'
> +fi
> +
> while test $# != 0
> do
> case "$1" in
next prev parent reply other threads:[~2008-08-17 2:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-17 0:26 [PATCH] Improve error output of git-rebase without any arguments Stephan Beyer
2008-08-17 2:37 ` Junio C Hamano [this message]
2008-08-17 4:05 ` [PATCH try2] Improve error output of git-rebase Stephan Beyer
2008-08-17 4:11 ` Stephan Beyer
2008-08-17 4:25 ` [PATCH try3] " Stephan Beyer
2008-08-17 5:55 ` 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=7v1w0ocqow.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox