diff --git a/bin/scalatest_diff b/bin/scalatest_diff index 6b5f812..818a02c 100755 --- a/bin/scalatest_diff +++ b/bin/scalatest_diff @@ -13,6 +13,8 @@ if len(args) == 1: splited = scalatest_output.split("did not equal") elif "was not equal to" in scalatest_output: splited = scalatest_output.split("was not equal to") + elif "did not contain the same elements as" in scalatest_output: + splited = scalatest_output.split("did not contain the same elements as") else: splited = None import difflib diff --git a/gitignore_global b/gitignore_global index 843a9d4..f5dd20b 100644 --- a/gitignore_global +++ b/gitignore_global @@ -131,3 +131,6 @@ own-alias.sbt # VSCode .vscode + +# Temporal notes +tmp_note* diff --git a/sbt/1.0/plugins/plugins.sbt b/sbt/1.0/plugins/plugins.sbt index fe24475..322f5d4 100644 --- a/sbt/1.0/plugins/plugins.sbt +++ b/sbt/1.0/plugins/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.duhemm" % "sbt-errors-summary" % "0.6.0") -addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1") +// addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1") addSbtPlugin("com.github.tkawachi" % "sbt-repeat" % "0.1.0") diff --git a/zshrc b/zshrc index 9ce6161..9304e4b 100644 --- a/zshrc +++ b/zshrc @@ -168,6 +168,8 @@ function kill_sbt() { ps aux | grep java | grep bin/sbt-launch.jar | awk '{print alias fucksbt="kill_sbt" alias killsbt="kill_sbt" +# C# setup +export DOTNET_CLI_TELEMETRY_OPTOUT=1 # Service aliases @@ -835,6 +837,9 @@ function gcurrent_branch_name() { git rev-parse --abbrev-ref HEAD ; } alias git_branch_name=gcurrent_branch_name alias gbname=gcurrent_branch_name +alias grh="git reset --hard" +function grh_same_branch_origin() { git reset --hard "origin/$(gcurrent_branch_name)" ; } + alias grm_deleted_files="git ls-files --deleted -z | xargs -0 git rm" # Git rm files that have been deleted alias gl="git log --graph --pretty=format:'%C(yellow)%h%Creset -%C(green)%d%Creset %s %C(magenta)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit"