Re: [PATCH] Improve error output of git-rebase without any arguments
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 17, 2008, 02:37 UTC
- Message-ID
- <7v1w0ocqow.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <1218932781-30475-1-git-send-email-s-beyer@gmx.net>
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?
Show 17 quoted lines
> 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