Git 1.8 and launcher rebuild

(Bernhard Fürst) #1

launcher rebuild does not work with Git 1.8.3 because in line 549-551 it uses the @ shortcut for HEAD. Git 1.8.3 does not know this shortcut. Using HEAD instead of @ will fix this:

LOCAL=$(git rev-parse HEAD)
REMOTE=$(git rev-parse @{u})
BASE=$(git merge-base HEAD @{u})

(Jeff Atwood) #2

I think we expect people to have a newer version of Git.

(Kane York) #3

Yeah, Git 1.9.x is an acceptable minimum I think.

(Jeff Atwood) #4

(Sam Saffron) #5

Note I am not against fixing this provided you submit a working PR, but you got to test everything.