rebase: make -v a tiny bit more verbose

To make it possible to later remove the handling of --abort from
git-rebase--interactive.sh, align the implementation in git-rebase.sh
with the former by making it a bit more verbose.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index eace4e53bc871f9f677b0c4d036e79573feb337f..acd02585643438b7ebb495a174f7b0b9dd217e23 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -86,20 +86,6 @@ warn () {
        printf '%s\n' "$*" >&2
 }
 
-output () {
-       case "$verbose" in
-       '')
-               output=$("$@" 2>&1 )
-               status=$?
-               test $status != 0 && printf "%s\n" "$output"
-               return $status
-               ;;
-       *)
-               "$@"
-               ;;
-       esac
-}
-
 # Output the commit message for the specified commit.
 commit_message () {
        git cat-file commit "$1" | sed "1,/^$/d"

diff --git a/git-rebase.sh b/git-rebase.sh
index 615d9ddea37e460a435258ff7b362b4f3282c018..0322f27edf9443b32915f4fc3af561c6b2738425 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -74,6 +74,20 @@ read_basic_state () {
        GIT_QUIET=$(cat "$state_dir"/quiet)
 }
 
+output () {
+       case "$verbose" in
+       '')
+               output=$("$@" 2>&1 )
+               status=$?
+               test $status != 0 && printf "%s\n" "$output"
+               return $status
+               ;;
+       *)
+               "$@"
+               ;;
+       esac
+}
+
 move_to_original_branch () {
        case "$head_name" in
        refs/*)
@@ -95,7 +109,7 @@ run_specific_rebase () {
        force_rebase action preserve_merges upstream switch_to head_name \
        state_dir orig_head onto_name GIT_QUIET revisions RESOLVEMSG \
        allow_rerere_autoupdate git_am_opt
-       export -f move_to_original_branch
+       export -f move_to_original_branch output
        exec git-rebase--$type
 }
 
@@ -268,7 +282,7 @@ continue)
        run_specific_rebase
        ;;
 skip)
-       git reset --hard HEAD || exit $?
+       output git reset --hard HEAD || exit $?
        read_basic_state
        run_specific_rebase
        ;;
@@ -281,7 +295,7 @@ abort)
                die "Could not move back to $head_name"
                ;;
        esac
-       git reset --hard $orig_head
+       output git reset --hard $orig_head
        rm -r "$state_dir"
        exit
        ;;