On Wed, Jan 31, 2007 at 02:10:37PM -0500, Nicolas Pitre wrote:
> This is not meant to frighten people or even to suggest they might be
> doing something wrong, but rather to notify them of a state change and
> provide a likely option in the case this state was entered by mistake.
I like this much better. Though I wonder in Carl's case if we can do
even better, since the user is checking out a tracking branch. Does it
really make sense to say "you are not on ANY branch"? Maybe instead:
-- >8 --
git-checkout: note use of remote tracking branch when making detached warning
---
Carl, can you comment? Does this require more explanation about why it
matters that you're on a remote tracking branch?
git-checkout.sh | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/git-checkout.sh b/git-checkout.sh
index ed04815..68533a1 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -14,6 +14,7 @@ force=
branch=
newbranch=
newbranch_log=
+detached_remote=
merge=
LF='
'
@@ -58,6 +59,9 @@ while [ "$#" != "0" ]; do
if git-show-ref --verify --quiet -- "refs/heads/$arg"
then
branch="$arg"
+ elif git-show-ref --verify --quiet -- "refs/remotes/$arg"
+ then
+ detached_remote="$arg"
fi
elif rev=$(git-rev-parse --verify "$arg^{tree}" 2>/dev/null)
then
@@ -155,7 +159,11 @@ then
detached="$new"
if test -n "$oldbranch"
then
- detach_warn="Note: you are not on ANY branch anymore.
+ case "$detached_remote" in
+ "") detach_warn="Note: you are not on ANY branch anymore." ;;
+ *) detach_warn="Note: you are on the remote tracking branch '$detached_remote'" ;;
+ esac
+ detach_warn="$detach_warn
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>"
--
1.5.0.rc2.587.gbedb-dirty
-
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