The main goal of this series is to teach git-am and git-rebase to be
quiet.
This series feels very improved. I'm pretty confident in the first
three patches. I've split off the suppressing errors from git-apply
in git-am into its own patch this time around. It felt more like
an independent change.
I've tried to make sure I maintained GIT_QUIET after failing to apply,
but I'd appreciate if others could look over that to make sure.
Changes since v3:
- simplify say()
- say "applying to an empty history" in am.sh
- quiet merge in rebase.sh::call_merge()
- drop >&2 in a couple places in rebase.sh
- maintain GIT_QUIET when git-am or git-rebase fails
- fixup style issues with repack.sh
- add to git_am_opt instead of hijacking GIT_QUIET in rebase.sh
Changes since v2:
- say uses printf instead of echo
- suppressing errors from git-apply under am -3 -q
- added a test for am -3 -q
- added a test for am where subjects have a literal newline
- am,rebase tests check both stdout and stderr
- rebase.sh::continue_merge() suppress the output of git rev-list
Changes since v1:
- introduction of say()
- migration of submodule and repack
Stephen Boyd (5):
t4150: test applying with a newline in subject
am: suppress apply errors when using 3-way
git-sh-setup: introduce say() for quiet options
submodule, repack: migrate to git-sh-setup's say()
am, rebase: teach quiet option
Documentation/git-am.txt | 6 ++++-
Documentation/git-rebase.txt | 4 +++
git-am.sh | 35 +++++++++++++++++++++++-------
git-rebase.sh | 48 +++++++++++++++++++++++++++++++++--------
git-repack.sh | 12 ++++------
git-sh-setup.sh | 9 +++++++
git-submodule.sh | 24 +++++---------------
t/t3400-rebase.sh | 19 +++++++++++-----
t/t4150-am.sh | 26 ++++++++++++++++++++++
9 files changed, 133 insertions(+), 50 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html