diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 13:43:51 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 14:08:09 -0800 |
| commit | 4974c2caa215a78dd0c6e3665e23e029d98cbbeb (patch) | |
| tree | 410d00d696be537d17696cecf609a5bcf76a4ec1 | |
| parent | 431b7e7818fe3d118e4bf9e40ba6807ed2c511be (diff) | |
| download | git-4974c2caa215a78dd0c6e3665e23e029d98cbbeb.tar.gz | |
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>
| -rwxr-xr-x | git-rebase--interactive.sh | 14 | ||||
| -rwxr-xr-x | git-rebase.sh | 18 |
2 files changed, 16 insertions, 16 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index fa8bfda765..affa467a63 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 c60221b5a4..42d635bc29 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/*) @@ -263,7 +277,7 @@ continue) run_specific_rebase ;; skip) - git reset --hard HEAD || exit $? + output git reset --hard HEAD || exit $? read_basic_state run_specific_rebase ;; @@ -276,7 +290,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 ;; |