Remove last git shell-out and fix dropped commit label

Remove last git shell-out and fix dropped commit label #8147