3 . /sys/lib/git/common.rc
7 flagfmt='a:listall, b:baseref ref, d:delete, n:newbr, s:stay, m:merge'
9 eval `''{aux/getflags $*} || exec aux/usage
16 awk '$1=="branch"{print $2}' < $gitfs/ctl
18 cd .git/refs/ && walk -f heads remotes
25 if(~ $branch refs/heads/*)
27 if not if(~ $branch heads/*)
30 new=refs/heads/$branch
32 orig=`{git/query HEAD}
34 base=`{git/query $baseref} || exit 'bad base'
35 if not if(test -e .git/$new)
36 base=`{git/query $new}
38 base=`{git/query HEAD}
42 die update would clobber $branch with $baseref
43 baseref=`$nl{echo -n $new | sed s@refs/heads/@refs/remotes/origin/@}
45 if(! test -e .git/$new)
46 if(! base=`{git/query $baseref})
47 die could not find branch $branch
49 modified=`$nl{git/query -c HEAD $base | grep '^[^-]' | subst '^..'}
50 deleted=`$nl{git/query -c HEAD $base | grep '^-' | subst '^..'}
52 if(! ~ $#modified 0 || ! ~ $#deleted 0 && ~ $#merge 0){
53 git/walk -fRMA $modified $deleted ||
54 die 'uncommited changes would be clobbered'
58 echo 'deleted branch' $new
61 commit=`{git/query $base} || die 'branch does not exist:' $base
63 mkdir -p .git/`{basename -d $new}
65 echo $commit > .git/$new
68 basedir=`{git/query -p $base}
70 if(! ~ $#modified 0 || ! ~ $#deleted 0)
71 dirtypaths=`$nl{git/walk -cfRMA $modified $deleted}
72 if(! ~ $#modified 0 || ! ~ $#deleted 0)
73 dirtypaths=`$nl{git/walk -cfRMA $modified $deleted}
75 cleanpaths=($modified $deleted)
78 for(p in $modified $deleted)
79 if(! ~ $p $dirtypaths)
80 cleanpaths=($cleanpaths $p)
83 echo $commit > .git/$new
84 for(m in $cleanpaths){
85 d=`$nl{basename -d $m}
87 mkdir -p .git/index9/tracked/$d
88 # Modifications can turn a file into
89 # a directory, or vice versa, so we
90 # need to delete and copy the files
96 if(test -f $basedir/tree/$m)
100 rm -rf .git/index9/tracked/$m
103 if(cp -x -- $basedir/tree/$m $m)
104 walk -eq $m > .git/index9/tracked/$m
106 echo -n > .git/index9/tracked/$m
110 for(ours in $dirtypaths){
111 common=$gitfs/object/$orig/tree/$ours
112 theirs=$gitfs/object/$base/tree/$ours
113 merge1 $ours $ours $common $theirs
118 rm -f .git/index9/tracked/$deleted
121 echo ref: $new > .git/HEAD