2005-06-21 18:47:37 +02:00
|
|
|
#!/bin/sh
|
2005-09-08 02:26:23 +02:00
|
|
|
. git-sh-setup || die "Not a git archive"
|
2005-07-08 19:57:21 +02:00
|
|
|
|
2005-06-21 18:47:37 +02:00
|
|
|
old=$(git-rev-parse HEAD)
|
2005-06-21 20:03:11 +02:00
|
|
|
new=
|
2005-06-21 18:59:26 +02:00
|
|
|
force=
|
2005-06-21 20:03:11 +02:00
|
|
|
branch=
|
2005-07-12 05:44:20 +02:00
|
|
|
newbranch=
|
2005-06-21 20:03:11 +02:00
|
|
|
while [ "$#" != "0" ]; do
|
|
|
|
arg="$1"
|
|
|
|
shift
|
|
|
|
case "$arg" in
|
2005-07-12 05:44:20 +02:00
|
|
|
"-b")
|
|
|
|
newbranch="$1"
|
|
|
|
shift
|
|
|
|
[ -z "$newbranch" ] &&
|
|
|
|
die "git checkout: -b needs a branch name"
|
|
|
|
[ -e "$GIT_DIR/refs/heads/$newbranch" ] &&
|
|
|
|
die "git checkout: branch $newbranch already exists"
|
|
|
|
;;
|
2005-06-21 18:47:37 +02:00
|
|
|
"-f")
|
2005-06-21 20:03:11 +02:00
|
|
|
force=1
|
2005-06-21 18:47:37 +02:00
|
|
|
;;
|
|
|
|
*)
|
2005-09-16 21:30:46 +02:00
|
|
|
rev=$(git-rev-parse --verify "$arg^0" 2>/dev/null) ||
|
2005-09-19 19:11:18 +02:00
|
|
|
die "I don't know any '$arg'."
|
2005-06-21 20:03:11 +02:00
|
|
|
if [ -z "$rev" ]; then
|
|
|
|
echo "unknown flag $arg"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
if [ "$new" ]; then
|
|
|
|
echo "Multiple revisions?"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
new="$rev"
|
2005-06-22 02:12:38 +02:00
|
|
|
if [ -f "$GIT_DIR/refs/heads/$arg" ]; then
|
2005-06-21 20:03:11 +02:00
|
|
|
branch="$arg"
|
|
|
|
fi
|
|
|
|
;;
|
2005-06-21 18:47:37 +02:00
|
|
|
esac
|
|
|
|
done
|
2005-06-21 20:14:47 +02:00
|
|
|
[ -z "$new" ] && new=$old
|
2005-06-21 18:47:37 +02:00
|
|
|
|
2005-07-12 05:44:20 +02:00
|
|
|
#
|
|
|
|
# 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"
|
|
|
|
|
2005-06-21 18:59:26 +02:00
|
|
|
if [ "$force" ]
|
2005-06-21 18:47:37 +02:00
|
|
|
then
|
|
|
|
git-read-tree --reset $new &&
|
2005-09-08 02:26:23 +02:00
|
|
|
git-checkout-index -q -f -u -a
|
2005-06-21 18:47:37 +02:00
|
|
|
else
|
2005-09-11 23:12:08 +02:00
|
|
|
git-update-index --refresh >/dev/null
|
2005-06-21 18:59:26 +02:00
|
|
|
git-read-tree -m -u $old $new
|
2005-06-22 00:40:00 +02:00
|
|
|
fi
|
|
|
|
|
|
|
|
#
|
|
|
|
# Switch the HEAD pointer to the new branch if it we
|
|
|
|
# checked out a branch head, and remove any potential
|
|
|
|
# old MERGE_HEAD's (subsequent commits will clearly not
|
|
|
|
# be based on them, since we re-set the index)
|
|
|
|
#
|
|
|
|
if [ "$?" -eq 0 ]; then
|
2005-07-12 05:44:20 +02:00
|
|
|
if [ "$newbranch" ]; then
|
|
|
|
echo $new > "$GIT_DIR/refs/heads/$newbranch"
|
|
|
|
branch="$newbranch"
|
|
|
|
fi
|
2005-09-30 23:26:57 +02:00
|
|
|
[ "$branch" ] &&
|
|
|
|
GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD "refs/heads/$branch"
|
2005-06-22 00:40:00 +02:00
|
|
|
rm -f "$GIT_DIR/MERGE_HEAD"
|
2005-08-23 23:03:14 +02:00
|
|
|
else
|
|
|
|
exit 1
|
2005-06-22 00:40:00 +02:00
|
|
|
fi
|