From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Jul 2008 00:12:09 +0000 (-0700)
Subject: Merge branch 'rs/rebase-checkout-not-so-quiet'
X-Git-Tag: v1.6.0-rc0~42
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5324a6339acfabdb27c9ef410525eb6b82d05002;p=git.git

Merge branch 'rs/rebase-checkout-not-so-quiet'

* rs/rebase-checkout-not-so-quiet:
  git-rebase: report checkout failure

Conflicts:
	git-rebase.sh
---

5324a6339acfabdb27c9ef410525eb6b82d05002
diff --cc git-rebase.sh
index 56cf6f031,7825f8895..6ef575481
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -376,9 -376,7 +376,8 @@@ f
  
  # Detach HEAD and reset the tree
  echo "First, rewinding head to replay your work on top of it..."
- git checkout "$onto^0" >/dev/null 2>&1 ||
- 	die "could not detach HEAD"
+ git checkout -q "$onto^0" || die "could not detach HEAD"
 +git update-ref ORIG_HEAD $branch
  
  # If the $onto is a proper descendant of the tip of the branch, then
  # we just fast forwarded.