fix logging all commits from develop (instead of just base branch) (#5)

GrayedFox · Jul 17, 2017 · b0fc59e · b0fc59e
1 parent dc83599
commit b0fc59e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app.js b/app.js
@@ -43,12 +43,12 @@ const init = () => {
   if (process.env.TRAVIS_PULL_REQUEST_BRANCH) {
     commitRef = process.env.TRAVIS_PULL_REQUEST_SHA
   }
-  console.log(`Commit reference: ${commitRef}`)
+  console.log(`Commit Reference: ${commitRef}`)
 }
 
 init()
 
-Promise.all([commandHandler(`getBranchCommitCount.sh ${commitRef}`), commandHandler('getFormattedBranchCommits.sh')]).then(
+Promise.all([commandHandler(`getBranchCommitCount.sh ${commitRef}`), commandHandler(`getFormattedBranchCommits.sh ${commitRef}`)]).then(
   ([commitCount, formattedBranchCommits]) => {
     if (commitCount > 1) {
       console.log(`

diff --git a/commands/getFormattedBranchCommits.sh b/commands/getFormattedBranchCommits.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-git log --first-parent origin/develop --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
+git log origin/develop..$1 --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "squashed",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A nifty tool to check if your branch needs to be rebased/squashed",
   "main": "app.js",
   "bin": {