checkout: automerge local changes while switching branches.
[git.git] / git-branch.sh
blobb0e54ed2af9dbf06e79b7230a62029ee2ee8a269
1 #!/bin/sh
3 USAGE='[-d <branch>] | [[-f] <branch> [start-point]]'
4 LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
5 If one argument, create a new branch <branchname> based off of current HEAD.
6 If two arguments, create a new branch <branchname> based off of <start-point>.'
8 SUBDIRECTORY_OK='Yes'
9 . git-sh-setup
11 headref=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
13 delete_branch () {
14 option="$1"
15 shift
16 for branch_name
18 case ",$headref," in
19 ",$branch_name,")
20 die "Cannot delete the branch you are on." ;;
21 ,,)
22 die "What branch are you on anyway?" ;;
23 esac
24 branch=$(cat "$GIT_DIR/refs/heads/$branch_name") &&
25 branch=$(git-rev-parse --verify "$branch^0") ||
26 die "Seriously, what branch are you talking about?"
27 case "$option" in
28 -D)
31 mbs=$(git-merge-base -a "$branch" HEAD | tr '\012' ' ')
32 case " $mbs " in
33 *' '$branch' '*)
34 # the merge base of branch and HEAD contains branch --
35 # which means that the HEAD contains everything in both.
38 echo >&2 "The branch '$branch_name' is not a strict subset of your current HEAD.
39 If you are sure you want to delete it, run 'git branch -D $branch_name'."
40 exit 1
42 esac
44 esac
45 rm -f "$GIT_DIR/refs/heads/$branch_name"
46 echo "Deleted branch $branch_name."
47 done
48 exit 0
51 force=
52 while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
54 case "$1" in
55 -d | -D)
56 delete_branch "$@"
57 exit
59 -f)
60 force="$1"
62 --)
63 shift
64 break
66 -*)
67 usage
69 esac
70 shift
71 done
73 case "$#" in
75 git-rev-parse --symbolic --all |
76 sed -ne 's|^refs/heads/||p' |
77 sort |
78 while read ref
80 if test "$headref" = "$ref"
81 then
82 pfx='*'
83 else
84 pfx=' '
86 echo "$pfx $ref"
87 done
88 exit 0 ;;
90 head=HEAD ;;
92 head="$2^0" ;;
93 esac
94 branchname="$1"
96 rev=$(git-rev-parse --verify "$head") || exit
98 git-check-ref-format "heads/$branchname" ||
99 die "we do not like '$branchname' as a branch name."
101 if [ -e "$GIT_DIR/refs/heads/$branchname" ]
102 then
103 if test '' = "$force"
104 then
105 die "$branchname already exists."
106 elif test "$branchname" = "$headref"
107 then
108 die "cannot force-update the current branch."
111 git update-ref "refs/heads/$branchname" $rev