Also add some checks that --continue/--abort/--skip actions are used without --onto, -p, -t, etc. Signed-off-by: Stephan Beyer <s-beyer@xxxxxxx> --- Hi, Dscho wrote: > You probably need to introduce checks against "git rebase --continue > --onto blabla", then. Now the is_standalone function does that. Regards, Stephan PS: I wondered that nobody moaned that the patch is for pu. git-rebase--interactive.sh | 71 +++++++++++++++++++++++++++++-------------- 1 files changed, 48 insertions(+), 23 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 3f926d8..1894c37 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -10,10 +10,27 @@ # The original idea comes from Eric W. Biederman, in # http://article.gmane.org/gmane.comp.version-control.git/22407 -USAGE='(--continue | --abort | --skip | [--preserve-merges] [--first-parent] - [--preserve-tags] [--verbose] [--onto <branch>] <upstream> [<branch>])' +OPTIONS_KEEPDASHDASH= +OPTIONS_SPEC="\ +git-rebase [-i] [options] [--] <upstream> [<branch>] +git-rebase [-i] (--continue | --abort | --skip) +-- + Available options are: +p,preserve-merges Try to recreate merges instead of ignoring them +t,preserve-tags Update tags to the new commit object +m,merge Always used (no-op) +i,interactive Always used (no-op) +onto= Rebase onto given branch instead of upstream +v,verbose Display a diffstat of what changed upstream + When preserving merges: +f,first-parent Show only commits following the first parent of each commit +s,strategy= Use the given merge strategy + Actions: +continue Continue rebasing process +abort Abort rebasing process and restore original branch +skip Skip current patch and continue rebasing process +" -OPTIONS_SPEC= . git-sh-setup require_work_tree @@ -25,6 +42,8 @@ SQUASH_MSG="$DOTEST"/message-squash PRESERVE_MERGES= STRATEGY= VERBOSE= +ONTO= +MARK_PREFIX='refs/rebase-marks' test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)" test -f "$DOTEST"/verbose && VERBOSE=t @@ -515,10 +534,19 @@ create_extended_todo_list () { done } +is_standalone () { + test $# -eq 2 -a "$2" = '--' && + test -z "$ONTO" && + test -z "$PRESERVE_TAGS" && + test -z "$PRESERVE_MERGES" && + test -z "$FIRST_PARENT" +} + while test $# != 0 do case "$1" in --continue) + is_standalone "$@" || usage comment_for_reflog continue test -d "$DOTEST" || die "No interactive rebase running" @@ -551,6 +579,7 @@ do do_rest ;; --abort) + is_standalone "$@" || usage comment_for_reflog abort git rerere clear @@ -568,6 +597,7 @@ do exit ;; --skip) + is_standalone "$@" || usage comment_for_reflog skip git rerere clear @@ -575,7 +605,7 @@ do output git reset --hard && do_rest ;; - -s|--strategy) + -s) case "$#,$1" in *,*=*) STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;; @@ -586,32 +616,36 @@ do shift ;; esac ;; - -m|--merge) + -m) # we use merge anyway ;; - -C*) - die "Interactive rebase uses merge, so $1 does not make sense" - ;; - -v|--verbose) + -v) VERBOSE=t ;; - -p|--preserve-merges) + -p) PRESERVE_MERGES=t ;; - -f|--first-parent) + -f) FIRST_PARENT=t PRESERVE_MERGES=t ;; - -t|--preserve-tags) + -t) PRESERVE_TAGS=t ;; - -i|--interactive) + -i) # yeah, we know ;; + --onto) + shift + ONTO=$(git rev-parse --verify "$1") || + die "Does not point to a valid commit: $1" + ;; ''|-h) usage ;; - *) + --) + shift + test $# -eq 1 -o $# -eq 2 || usage test -d "$DOTEST" && die "Interactive rebase already started" @@ -620,15 +654,6 @@ do comment_for_reflog start - ONTO= - case "$1" in - --onto) - ONTO=$(git rev-parse --verify "$2") || - die "Does not point to a valid commit: $2" - shift; shift - ;; - esac - require_clean_work_tree UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base" -- 1.5.6.167.g86f2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
