From: Junio C Hamano <junkio@cox•net>
To: Xavier Maillard <zedek@gnu•org>
Cc: Jakub Narebski <jnareb@gmail•com>,
Linus Torvalds <torvalds@linux-foundation•org>,
git@vger•kernel.org
Subject: Re: [PATCH] checkout -d: explicitly detach HEAD even when switching to the tip of a branch
Date: Tue, 03 Apr 2007 17:11:44 -0700 [thread overview]
Message-ID: <7vtzvxt2v3.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <200703311455.l2VEtHO5021300@localhost.localdomain> (Xavier Maillard's message of "Sat, 31 Mar 2007 16:55:17 +0200")
Xavier Maillard <zedek@gnu•org> writes:
> > You cannot currently checkout the tip of an existing branch
> > without moving to the branch.
> >
> > This allows you to detach your HEAD and place it at such a
> > commit, with:
> >
> > $ git checkout -d master
>
> What about
>
> $ git checkout master^0
>
> trick to force detaching?
>
> I love this idea.
Could anybody remind me why we have the "new != old" check here?
diff --git a/git-checkout.sh b/git-checkout.sh
index a7390e8..573a3c0 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -170,7 +170,7 @@ describe_detached_head () {
}
}
-if test -z "$branch$newbranch" && test "$new" != "$old"
+if test -z "$branch$newbranch"
then
detached="$new"
if test -n "$oldbranch" && test -z "$quiet"
I think I do not need an explicit -d option if we just remove
that second test. It is coming from an ancient commit 91dcdfd3,
and I _think_ it was to prevent something like:
git-checkout-script v2.6.12^0
from succeeding, while allowing
git-checkout-script HEAD^0
to be a no-op (as it happens to be naming the same commit).
commit 91dcdfd3b5331d955cfb60edf8930f1b5c142905
Author: Linus Torvalds <torvalds@g5•osdl.org>
Date: Mon Jul 11 20:44:20 2005 -0700
Make "git checkout" create new branches on demand
diff --git a/git-checkout-script b/git-checkout-script
index 48e1da9..7e70338 100755
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -5,10 +5,19 @@ old=$(git-rev-parse HEAD)
...
@@ -32,6 +41,16 @@ while [ "$#" != "0" ]; do
done
[ -z "$new" ] && new=$old
+#
+# If we don't have an old branch that we're switching to,
+# and we don't have a new branch name for the target we
+# are switching to, then we'd better just be checking out
+# what we already had
+#
+[ -z "$branch$newbranch" ] &&
+ [ "$new" != "$old" ] &&
+ die "git checkout: you need to specify a new branch name"
+
if [ "$force" ]
then
git-read-tree --reset $new &&
@@ -47,6 +66,10 @@ fi
...
next prev parent reply other threads:[~2007-04-04 0:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-29 8:02 [PATCH] checkout -d: explicitly detach HEAD even when switching to the tip of a branch Junio C Hamano
2007-03-29 10:44 ` Xavier Maillard
2007-03-29 17:10 ` Alex Riesen
2007-03-29 20:54 ` Xavier Maillard
2007-03-31 0:11 ` Jakub Narebski
2007-03-31 14:55 ` Xavier Maillard
2007-04-04 0:11 ` Junio C Hamano [this message]
2007-04-04 1:55 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vtzvxt2v3.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=zedek@gnu$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox