undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: execute hook only after argument checking

Browse Source 
Previously, the pre-rebase-hook would be launched before we knew if
the <upstream> [<branch>] arguments were supplied.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Rast 2009-01-02 23:28:26 +01:00 committed by Junio C Hamano
parent 8104ebfe82
commit d8fab0234d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-rebase--interactive.sh
View File

@ -554,7 +554,6 @@ first and then run 'git rebase --continue' again."
;; ;;
--) --)
shift shift
run_pre_rebase_hook ${1+"$@"}
test $# -eq 1 -o $# -eq 2 || usage test $# -eq 1 -o $# -eq 2 || usage
test -d "$DOTEST" && test -d "$DOTEST" &&
die "Interactive rebase already started" die "Interactive rebase already started"
@ -562,11 +561,13 @@ first and then run 'git rebase --continue' again."
git var GIT_COMMITTER_IDENT >/dev/null || git var GIT_COMMITTER_IDENT >/dev/null ||
die "You need to set your committer info first" die "You need to set your committer info first"
UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"
run_pre_rebase_hook ${1+"$@"}
comment_for_reflog start comment_for_reflog start
require_clean_work_tree require_clean_work_tree
UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"
test -z "$ONTO" && ONTO=$UPSTREAM test -z "$ONTO" && ONTO=$UPSTREAM
if test ! -z "$2" if test ! -z "$2"