Re: [PATCH] Improve error output of git-rebase without any arguments
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:10
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] Improve error output of git-rebase without any arguments · Stephan Beyer <hidden>
Stephan Beyer [off-list ref] 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?
quoted hunk
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