summaryrefslogtreecommitdiff
path: root/git-checkout-script
blob: 48e1da9399b645d8942c7d2d399beeff28153506 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
#!/bin/sh
. git-sh-setup-script || die "Not a git archive"
 
old=$(git-rev-parse HEAD)
new=
force=
branch=
while [ "$#" != "0" ]; do
    arg="$1"
    shift
    case "$arg" in
	"-f")
		force=1
		;;
	*)
		rev=$(git-rev-parse --verify --revs-only "$arg^0") || exit
		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" ]
then
    git-read-tree --reset $new &&
	git-checkout-cache -q -f -u -a
else
    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