diff --git a/git-checkout-script b/git-checkout-script
index e8e777f1f23e71fde909ce0d831d4a319993c0ab..ea7fef54ab6e1a6e04b87aa749c19ae916190d26 100755 (executable)
--- a/git-checkout-script
+++ b/git-checkout-script
#!/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
-force=0
-while [ $i -lt ${#args} ]; do
- case "${args[$i]}" in
+new=
+force=
+branch=
+while [ "$#" != "0" ]; do
+ arg="$1"
+ shift
+ case "$arg" in
"-f")
- force=1;;
- "")
+ force=1
;;
*)
- echo "unknown flag ${args[$i]}"
- exit 1;;
+ rev=$(git-rev-parse --verify --revs-only "$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/refs/heads/$arg" ]; then
+ branch="$arg"
+ fi
+ ;;
esac
i=$(($i+1))
done
+[ -z "$new" ] && new=$old
-if $force
+if [ "$force" ]
then
git-read-tree --reset $new &&
- git-checkout-cache -q -f -u -a &&
- echo $new > "$GIT_DIR/HEAD"
+ git-checkout-cache -q -f -u -a
else
- git-read-tree -m -u $old $new && echo $new > "$GIT_DIR/HEAD"
+ git-read-tree -m -u $old $new
+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
+ [ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
+ rm -f "$GIT_DIR/MERGE_HEAD"
fi