annotate contrib/git-add-user-branch.sh @ 158:494b0b89df80 default tip

...
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 25 May 2020 18:13:55 +0900
parents 1830386684a0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
145
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
1 #! /bin/sh -e
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
2
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
3 # Create a new upstream user branch.
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
4
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
5 # Usage:
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
6 # contrib/git-add-user-branch.sh [<personal-prefix>/]<branch-name> <base>
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
7
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
8 usage ()
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
9 {
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
10 echo "Usage:"
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
11 echo " $0 [<personal-prefix>/]<branch-name> <start-point>"
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
12 echo
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
13 echo "personal space must already have been set up using"
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
14 echo "contrib/gcc-git-customization.sh"
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
15 exit 1
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
16 }
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
17
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
18 if [ $# != 2 ]
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
19 then
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
20 usage
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
21 fi
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
22
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
23 userpfx=$(git config --get "gcc-config.userpfx")
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
24 user=$(git config --get "gcc-config.user")
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
25
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
26 if [ -z "$userpfx" -o -z "$user" ]
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
27 then
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
28 usage
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
29 fi
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
30
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
31 branch=$(echo "$1" | sed -r "s:(${userpfx}/)?(.*)$:\2:")
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
32 start=$2
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
33
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
34 # Sanity check the new branch argument. If there is no '/', then the
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
35 # vendor will be the same as the entire first argument.
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
36 if [ -z "$branch" ]
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
37 then
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
38 usage
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
39 fi
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
40
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
41 git push users/${userpfx} ${start}:refs/users/${user}/heads/${branch}
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
42 git fetch -q users/${userpfx}
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
43 git branch ${userpfx}/${branch} remotes/users/${userpfx}/${branch}
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
44 echo "You are now ready to check out ${userpfx}/${branch}"
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
45 echo "To push the branch upstream use:"
1830386684a0 gcc-9.2.0
anatofuz
parents:
diff changeset
46 echo " git push users/${userpfx} ${userpfx}/${branch}"