cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-24 11:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

codereview: fix a few bugs

Browse source 
Change-Id: Ifd9fda05e15c9e1e106ffd4e30e1dafe8423cdf4
This commit is contained in:
Russ Cox 2014-11-16 21:28:05 -05:00
parent 95fee1d42e
commit 32f3c4ade4
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bin/codereview
View file

@ -46,23 +46,24 @@ case pending
case create case create
shift shift
if(! ~ $#* 1) { if(~ $#* 0) {
echo 'usage: codereview create branchname' >[1=2] echo 'usage: codereview create branchname' >[1=2]
exit usage exit usage
} }
branch=$1 branch=$1
if(! git branch -l | 9 grep '\* master$') { shift
if(! git branch -l | 9 grep '\* master$' >/dev/null) {
echo 'codereview: create not on master branch; use codereview commit' >[1=2] echo 'codereview: create not on master branch; use codereview commit' >[1=2]
exit master exit master
} }
if($show) { if($show) {
echo '% git branch '$branch' && git commit || git branch -d '$branch >[1=2] echo '% git branch '$branch' && git commit || git branch -d '$branch >[1=2]
} }
git branch $branch && git commit $* || git branch -d $branch git branch $branch && git checkout $branch && git commit $* || git branch -d $branch
case commit case commit
shift shift
if(git branch -l | 9 grep '\* master$') { if(git branch -l | 9 grep '\* master$' >/dev/null) {
echo 'codereview: commit on master branch; use codereview create <branchname>' >[1=2] echo 'codereview: commit on master branch; use codereview create <branchname>' >[1=2]
exit master exit master
} }
@ -75,7 +76,7 @@ case commit
exit $status exit $status
case upload case upload
if(git branch -l | 9 grep '\* master$') { if(git branch -l | 9 grep '\* master$' >/dev/null) {
echo 'codereview: upload on master branch' >[1=2] echo 'codereview: upload on master branch' >[1=2]
exit master exit master
} }
@ -110,7 +111,7 @@ case sync
} }
# Exactly this commit in master. Fast-forward from master and delete this branch. # Exactly this commit in master. Fast-forward from master and delete this branch.
if(git branch -r --contains HEAD | 9 grep '^ *origin/master$') { if(git branch -r --contains HEAD | 9 grep '^ *origin/master$' >/dev/null) {
$git checkout -q master $git checkout -q master
$git merge -q --ff-only origin/master $git merge -q --ff-only origin/master
$git branch -q -d $branch $git branch -q -d $branch
@ -123,7 +124,7 @@ case sync
exit changeid exit changeid
} }
if(git log --grep 'Change-Id: '$changeid origin/master | 9 grep .) { if(git log --grep 'Change-Id: '$changeid origin/master | 9 grep . >/dev/null) {
# Something like this got submitted. # Something like this got submitted.
$git checkout -q master $git checkout -q master
$git merge -q --ff-only origin/master $git merge -q --ff-only origin/master
@ -132,7 +133,7 @@ case sync
exit 1 exit 1
} }
if(git branch -r --contains master | 9 grep '^ *origin/master$') if(git branch -r --contains master | 9 grep '^ *origin/master$' >/dev/null)
$git branch -f master origin/master $git branch -f master origin/master
$git rebase -q origin/master $git rebase -q origin/master