Skip to content

Commit

Permalink
Release 0.0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
simonharrer committed May 15, 2020
1 parent 0b1696b commit e60bded
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 0.0.15
- Any `git push` command now uses the `--no-verify` flag

# 0.0.14
- New homepage available at https://mob.sh
- `mob config` prints configuration using the environment variable names which allow overriding the values
Expand Down
14 changes: 7 additions & 7 deletions mob.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"
)

const versionNumber = "0.0.15-dev"
const versionNumber = "0.0.15"

var wipBranch = "mob-session" // override with MOB_WIP_BRANCH environment variable
var baseBranch = "master" // override with MOB_BASE_BRANCH environment variable
Expand Down Expand Up @@ -187,7 +187,7 @@ func reset() {
git("branch", "-D", wipBranch)
}
if hasMobProgrammingBranchOrigin() {
git("push", remoteName, "--delete", wipBranch)
git("push", "--no-verify", remoteName, "--delete", wipBranch)
}
}

Expand Down Expand Up @@ -221,7 +221,7 @@ func start(parameter []string) {
git("merge", remoteName+"/"+baseBranch, "--ff-only")
git("branch", wipBranch)
git("checkout", wipBranch)
git("push", "--set-upstream", remoteName, wipBranch)
git("push", "--no-verify", "--set-upstream", remoteName, wipBranch)
} else if !hasMobProgrammingBranch() && hasMobProgrammingBranchOrigin() {
sayInfo("joining mob session")
git("checkout", wipBranch)
Expand All @@ -234,7 +234,7 @@ func start(parameter []string) {
git("merge", remoteName+"/"+baseBranch, "--ff-only")
git("branch", wipBranch)
git("checkout", wipBranch)
git("push", "--set-upstream", remoteName, wipBranch)
git("push", "--no-verify", "--set-upstream", remoteName, wipBranch)
}

if mobStartIncludeUncommittedChanges && stashed {
Expand Down Expand Up @@ -301,7 +301,7 @@ func next() {
git("add", "--all")
git("commit", "--message", "\""+wipCommitMessage+"\"", "--no-verify")
changes := getChangesOfLastCommit()
git("push", remoteName, wipBranch)
git("push", "--no-verify", remoteName, wipBranch)
say(changes)
}
showNext()
Expand Down Expand Up @@ -332,14 +332,14 @@ func done() {
git("add", "--all")
git("commit", "--message", "\""+wipCommitMessage+"\"", "--no-verify")
}
git("push", remoteName, wipBranch)
git("push", "--no-verify", remoteName, wipBranch)

git("checkout", baseBranch)
git("merge", remoteName+"/"+baseBranch, "--ff-only")
git("merge", "--squash", "--ff", wipBranch)

git("branch", "-D", wipBranch)
git("push", remoteName, "--delete", wipBranch)
git("push", "--no-verify", remoteName, "--delete", wipBranch)
say(getCachedChanges())
sayTodo("git commit -m 'describe the changes'")
} else {
Expand Down

0 comments on commit e60bded

Please sign in to comment.