Rearrange our renaming to pacify tslint
Rearrange our renaming to pacify tslint

Otherwise it thinks we're using `GitError` before it is declared :shrug:

desktop/desktop,desktop/desktop,artivilla/desktop,BugTesterTest/desktops,BugTesterTest/desktops,shiftkey/desktop,j-f1/forked-desktop,j-f1/forked-desktop,artivilla/desktop,gengjiawen/desktop,BugTesterTest/desktops,say25/desktop,desktop/desktop,say25/desktop,gengjiawen/desktop,BugTesterTest/desktops,j-f1/forked-desktop,shiftkey/desktop,kactus-io/kactus,hjobrien/desktop,desktop/desktop,hjobrien/desktop,kactus-io/kactus,shiftkey/desktop,hjobrien/desktop,say25/desktop,artivilla/desktop,kactus-io/kactus,kactus-io/kactus,artivilla/desktop,say25/desktop,gengjiawen/desktop,hjobrien/desktop,j-f1/forked-desktop,shiftkey/desktop,gengjiawen/desktop