Browse files

Only reset the branch if we're on master on the assumption that it's …

…an integration point.
  • Loading branch information...
1 parent df3b013 commit 0ce775bf7b390560f9fd57ca76a514ad08c379e6 Brian Donovan committed Oct 9, 2009
Showing with 2 additions and 2 deletions.
  1. +2 −2 bin/git-review
View
4 bin/git-review
@@ -204,7 +204,7 @@ pushReview() {
git_push_output=$(test -f $GIT_OUTPUT_FILE && cat $GIT_OUTPUT_FILE)
- if [ "$CURRENT" = "$TRACK" ]; then
+ if [ "$CURRENT" = "master" ]; then
git reset --hard $REMOTE/$TRACK ||
die "Could not reset your $TRACK branch to $REMOTE/$TRACK."
fi
@@ -216,7 +216,7 @@ pushReview() {
eval "$BROWSER $url"
fi
- if [ "$CURRENT" = "$TRACK" ]; then
+ if [ "$CURRENT" = "master" ]; then
good "Successfully pushed '$LOG' for review and reset $TRACK"
else
good "Successfully pushed '$LOG' for review"

0 comments on commit 0ce775b

Please sign in to comment.