[PATCH 22/31] rebase: make -v a tiny bit more verbose
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Dec 28, 2010, 09:30 UTC
- Message-ID
- <1293528648-21873-23-git-send-email-martin.von.zweigbergk@gmail.com>
- In-Reply-To
- <1293528648-21873-1-git-send-email-martin.von.zweigbergk@gmail.com>
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> ---
What do we really want to print when -v is passed? Interactive rebase is currently quite a bit more verbose than non-interactive rebase.
git-rebase--interactive.sh | 14 -------------- git-rebase.sh | 20 +++++++++++++++++--- 2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index eace4e5..acd0258 100755 --- 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 615d9dd..0322f27 100755 --- 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 ;;
-- 1.7.3.2.864.gbbb96