validate git hash as short

ShMcK · ShMcK · commit 69e6ce72e800 · 2020-04-19T15:31:00.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/src/actions/setupActions.ts b/src/actions/setupActions.ts
@@ -25,7 +25,7 @@ export const setupActions = async ({ actions, send, path }: SetupActions): Promi
     const currentCommits: string[] = await git.loadCommitHistory()
     for (const commit of commits) {
       // validate that commit has not already been created as a safety net
-      if (currentCommits.includes(commit)) {
+      if (currentCommits.includes(git.getShortHash(commit))) {
         logger(`Commit ${commit} already loaded`)
         alreadyLoaded = true
         continue
diff --git a/src/services/git/index.ts b/src/services/git/index.ts
@@ -1,6 +1,7 @@
 import * as TT from 'typings/tutorial'
 import { exec, exists } from '../node'
 import logger from '../logger'
+import { stringify } from 'querystring'
 
 const gitOrigin = 'coderoad'
 
@@ -153,3 +154,9 @@ export async function loadCommitHistory(): Promise<string[]> {
     return []
   }
 }
+
+// return the short form of a hash (first 7 characters)
+// using `git rev-parse` seems unnecessarily slower
+export function getShortHash(hash: string): string {
+  return hash.slice(0, 7)
+}
