resolve #236, resolve #237: git hack/extract - branch exists on remote

@kevgo
Same unneeded commits here