diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2009-01-02 23:28:26 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-03 14:22:50 -0800 |
| commit | d8fab0234d6db440a71f38f8538dbdefbbdfd077 (patch) | |
| tree | c53817d6bc49b8b44da8333a10520575b780b781 | |
| parent | GIT 1.6.1 (diff) | |
| download | tgif-d8fab0234d6db440a71f38f8538dbdefbbdfd077.tar.xz | |
rebase -i: execute hook only after argument checking
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>
| -rwxr-xr-x | git-rebase--interactive.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c8b0861c08..2c668cd81a 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -554,7 +554,6 @@ first and then run 'git rebase --continue' again." ;; --) shift - run_pre_rebase_hook ${1+"$@"} test $# -eq 1 -o $# -eq 2 || usage test -d "$DOTEST" && die "Interactive rebase already started" @@ -562,11 +561,13 @@ first and then run 'git rebase --continue' again." git var GIT_COMMITTER_IDENT >/dev/null || 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 require_clean_work_tree - UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base" test -z "$ONTO" && ONTO=$UPSTREAM if test ! -z "$2" |