diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-06-16 22:33:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-18 18:54:48 (GMT) |
| commit | 0e987a12fc1d481d81ad9c56f4714efb08667213 (patch) | |
| tree | 3558298ec717c32ddac1204e6c9f751ab0da4d38 /t/t3400-rebase.sh | |
| parent | 2e6a30ef8fbaedc5f2ee199d36f7256bb0cfdf1e (diff) | |
| download | git-0e987a12fc1d481d81ad9c56f4714efb08667213.zip git-0e987a12fc1d481d81ad9c56f4714efb08667213.tar.gz git-0e987a12fc1d481d81ad9c56f4714efb08667213.tar.bz2 | |
am, rebase: teach quiet option
git-am and git-rebase are talkative scripts. Teach them to be quiet when
told, allowing them to speak only when they fail or experience errors.
The quiet option is maintained when git-am or git-rebase fails to apply
a patch. This means subsequent --resolved, --continue, --skip, --abort
invocations will be quiet if the original invocation was quiet.
Drop a handful of >&2 redirection; the rest of the program sends all the
info messages to stdout, not to stderr.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 7f62bfb..c5c29cc 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -54,8 +54,8 @@ test_expect_success 'rebase against master' ' git rebase master' test_expect_success 'rebase against master twice' ' - git rebase master 2>err && - grep "Current branch my-topic-branch is up to date" err + git rebase master >out && + grep "Current branch my-topic-branch is up to date" out ' test_expect_success 'rebase against master twice with --force' ' @@ -65,14 +65,14 @@ test_expect_success 'rebase against master twice with --force' ' test_expect_success 'rebase against master twice from another branch' ' git checkout my-topic-branch^ && - git rebase master my-topic-branch 2>err && - grep "Current branch my-topic-branch is up to date" err + git rebase master my-topic-branch >out && + grep "Current branch my-topic-branch is up to date" out ' test_expect_success 'rebase fast-forward to master' ' git checkout my-topic-branch^ && - git rebase my-topic-branch 2>err && - grep "Fast-forwarded HEAD to my-topic-branch" err + git rebase my-topic-branch >out && + grep "Fast-forwarded HEAD to my-topic-branch" out ' test_expect_success \ @@ -126,4 +126,11 @@ test_expect_success 'Show verbose error when HEAD could not be detached' ' grep "Untracked working tree file .B. would be overwritten" output.err ' +test_expect_success 'rebase -q is quiet' ' + rm B && + git checkout -b quiet topic && + git rebase -q master > output.out 2>&1 && + test ! -s output.out +' + test_done |