Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Make "git checkout" know about different branches
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Tue, 21 Jun 2005 18:03:11 +0000
(11:03 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Tue, 21 Jun 2005 18:03:11 +0000
(11:03 -0700)
Now "git checkout xyzzy" will check out branch "xyzzy" and
switch the HEAD to it.
git-checkout-script
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
a79944d
)
diff --git
a/git-checkout-script
b/git-checkout-script
index dc1cffde0bd214b90f0c0b754f0e5f33bd3023b2..a3bfae79dbf868c0a155dccb5d7b79fb3da2799e 100755
(executable)
--- a/
git-checkout-script
+++ b/
git-checkout-script
@@
-1,27
+1,35
@@
#!/bin/sh
: ${GIT_DIR=.git}
old=$(git-rev-parse HEAD)
#!/bin/sh
: ${GIT_DIR=.git}
old=$(git-rev-parse HEAD)
-new=$(git-rev-parse --revs-only "$@")
-new=${new:-$old}
-args=($(git-rev-parse --no-revs "$@"))
-
-i=0
+new=
force=
force=
-update=
-while [ $i -lt ${#args} ]; do
- case "${args[$i]}" in
+branch=
+while [ "$#" != "0" ]; do
+ arg="$1"
+ shift
+ case "$arg" in
"-f")
"-f")
- force=1;;
- "-u")
- update=1;;
- "")
+ force=1
;;
*)
;;
*)
- echo "unknown flag ${args[$i]}"
- exit 1;;
+ rev=$(git-rev-parse "$arg")
+ if [ -z "$rev" ]; then
+ echo "unknown flag $arg"
+ exit 1
+ fi
+ if [ "$new" ]; then
+ echo "Multiple revisions?"
+ exit 1
+ fi
+ new="$rev"
+ if [ -f "$GIT_DIR/revs/heads/$arg" ]; then
+ branch="$arg"
+ fi
+ ;;
esac
i=$(($i+1))
done
esac
i=$(($i+1))
done
+: ${new=$old}
if [ "$force" ]
then
if [ "$force" ]
then
@@
-29,5
+37,4
@@
then
git-checkout-cache -q -f -u -a
else
git-read-tree -m -u $old $new
git-checkout-cache -q -f -u -a
else
git-read-tree -m -u $old $new
-fi && [ "$update" ] && echo $new > "$GIT_DIR/HEAD"
-
+fi && [ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"