Merge branch 'main' into codeql_download_info

github · Sep 7, 2020 · 1a772a2 · 1a772a2
2 parents 32eb1c4 + 0e9b8f4
commit 1a772a2
Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/lib/runner.js b/lib/runner.js
diff --git a/lib/runner.js.map b/lib/runner.js.map
diff --git a/src/runner.ts b/src/runner.ts
@@ -66,6 +66,16 @@ function importTracerEnvironment(config: Config) {
   }
 }
 
+// Allow the user to specify refs in full refs/heads/branch format
+// or just the short branch name and prepend "refs/heads/" to it.
+function parseRef(userInput: string): string {
+  if (userInput.startsWith('refs/')) {
+    return userInput;
+  } else {
+    return 'refs/heads/' + userInput;
+  }
+}
+
 interface InitArgs {
   languages: string | undefined;
   queries: string | undefined;
@@ -265,7 +275,7 @@ program
       await runAnalyze(
         parseRepositoryNwo(cmd.repository),
         cmd.commit,
-        cmd.ref,
+        parseRef(cmd.ref),
         undefined,
         undefined,
         undefined,
@@ -316,7 +326,7 @@ program
         cmd.sarifFile,
         parseRepositoryNwo(cmd.repository),
         cmd.commit,
-        cmd.ref,
+        parseRef(cmd.ref),
         undefined,
         undefined,
         undefined,