Mar 24, 2016 - Starting ACC (ATG Control Centre) on OS-X

Comments

Starting ACC (ATG Control Centre) on OS-X

Copy the installation of ACC for respective version from a Linux VM:

The startup script in bin/startClient will fail, because it cannot determine which Java to use to run the app.

It is trying to determine Unix flavour, failing that defaults to Solaris and ends up with invalid settings.

Fix

Set the variable JAVA_VM to path to executable command on your system.

which java
java is /Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/bin/java
java is /usr/bin/java
  
export JAVA_VM=/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/bin/java

After that, it works.

You can also modify the script to make sure this happens automagically. I have commented out the Solaris default and replaced it with my Java

Mar 23, 2016 - Git bits 2

Comments

Git bits 2

Using the Scala source repo to demonstrate - see Github

Show merged and unmerged branches

This command allows you to show all local branches merged / unmerged to current branch

➜  scala git:(2.12.x) git branch -a --merged
* 2.12.x
  remotes/origin/2.11.x
  remotes/origin/2.12.x
  remotes/origin/HEAD -> origin/2.12.x
➜  scala git:(2.12.x) git branch -a --no-merged
  remotes/origin/2.10.x
  remotes/origin/2.8.x
  remotes/origin/2.9.x
  remotes/origin/DarkDimius-patch-1
  remotes/origin/gh-pages
  remotes/origin/legacy/msil

This shows you all local branches merged into named branch:

➜  scala git:(2.12.x) git branch -a --merged origin/2.9.x
  remotes/origin/2.9.x

Better output

Put these 2 lines into ~/.gitconfig under the ‘[alias]’ section

unmerged = !git branch -r --no-merged | grep -v HEAD | xargs -L1 git --no-pager log --pretty=tformat:'%Cgreen%d%Creset | %h | %an | %Cblue%ar%Creset' -1 | column -t -s '|'
merged = !git branch -r --merged | grep -v HEAD | xargs -L1 git --no-pager log --pretty=tformat:'%Cgreen%d%Creset | %h | %an | %Cblue%ar%Creset' -1 | column -t -s '|'

Here is how my alias section looks like

This is the output of the commands

➜  scala git:(2.12.x) git unmerged
fatal: Unknown commit master

There are no local branches out of sync with master
➜  scala git:(2.12.x) git merged
 (origin/2.11.x)                               1fcfdd8    Lukas Rytz     4 days ago
 (HEAD, origin/HEAD, origin/2.12.x, 2.12.x)    0e4c39a    Vlad Ureche    2 days ago

Mar 22, 2016 - Git - find unmerged commits

Comments

Git - find unmerged commits

This is Ruby script I found way back and was using it since.

The credits for creation goes to Zach Dennis. The script is decribed in his blog post

The source is here

Example

This is beginning of very long output from Groovy source

The code