Merge pull request #540 from zdenektopic/bugfix/stash-api-committer

BitBucket/Stash Server committer
danger · Mar 20, 2018 · eb6e7bb · eb6e7bb
2 parents ba7630c + 3763449
commit eb6e7bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ## Master
 
+* Fix `committer` field issue - missing in Stash API. [@zdenektopic][]
 * Add `reset-status` command [@mxstbr][]
 
 ## 3.2.0

diff --git a/source/platforms/bitbucket_server/BitBucketServerGit.ts b/source/platforms/bitbucket_server/BitBucketServerGit.ts
@@ -35,10 +35,14 @@ function bitBucketServerCommitToGitCommit(
       name: bbsCommit.author.name,
       date: new Date(bbsCommit.authorTimestamp).toISOString(),
     },
-    committer: {
+    committer: bbsCommit.committer ? {
       email: bbsCommit.committer.emailAddress,
       name: bbsCommit.committer.name,
       date: new Date(bbsCommit.committerTimestamp).toISOString(),
+    } : {
+      email: bbsCommit.author.emailAddress,
+      name: bbsCommit.author.name,
+      date: new Date(bbsCommit.authorTimestamp).toISOString(),
     },
     message: bbsCommit.message,
     tree: null,