summaryrefslogtreecommitdiff
path: root/builtin/receive-pack.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2015-04-28 01:17:37 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-28 11:38:40 -0700
commit22946a942627d67b09a9630a036e48ce2823cd0c (patch)
tree3d01b4c9a940040688aac0c50d022e6cad11f06f /builtin/receive-pack.c
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-22946a942627d67b09a9630a036e48ce2823cd0c.tar.xz
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/receive-pack.c')
0 files changed, 0 insertions, 0 deletions