On Mon, Apr 27, 2015 at 12:05:41PM -0700, Sam Cates wrote:
> STEPS TO REPRODUCE:
> 1. git checkout master
> 2. git rebase --quiet master topic
>
> EXPECTED RESULTS:
> The checkout and rebase occur with no output.
>
> ACTUAL RESULTS:
> The output from the checkout is not suppressed.
Can you be more specific about your setup? What is the relationship
between "master" and "topic"?
If "topic" is already up to date with master, I get:
$ git rebase --quiet master topic
Switched to branch 'topic'
(the --quiet does suppress "Current branch topic is up to date"). The
patch below addresses that. But there may be other calls to git-checkout
that would need similar treatment (either unconditional "-q" as below,
or respecting $GIT_QUIET, depending on the individual case).
-- >8 --
Subject: rebase: silence "git checkout" for noop rebase
When the branch to be rebased is already up to date, we
"git checkout" the branch, print an "up to date" message,
and end the rebase early. However, our checkout may print
"Switched to branch 'foo'" or "Already on 'foo'", even if
the user has asked for "--quiet".
We should avoid printing these messages at all, "--quiet" or
no. Since the rebase is a noop, this checkout can be seen as
optimizing out these other two checkout operations (that
happen in a real rebase):
1. Moving to the detached HEAD to start the rebase; we
always feed "-q" to checkout there, and instead rely on
our own custom message (which respects --quiet).
2. Finishing a rebase, where we move to the final branch.
Here we actually use update-ref rather than
git-checkout, and produce no messages.
Signed-off-by: Jeff King <[email protected]>
---
git-rebase.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 55da9db..90854e3 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -582,7 +582,7 @@ then
# Lazily switch to the target branch if needed...
test -z "$switch_to" ||
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
- git checkout "$switch_to" --
+ git checkout -q "$switch_to" --
say "$(eval_gettext "Current branch \$branch_name is up to
date.")"
finish_rebase
exit 0
--
2.4.0.rc3.477.gc25258d
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
