GitCommandExecutor: make committer match author (#1226)

* GitCommandExecutor: make committer match author

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Add changelog entry

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 31a11a1ebb)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

CHANGELOG.md

@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 -   If multiple username fields exist in the password, we now ensure the later ones are not dropped from extra content.
 -   Icons in Autofill suggestions are no longer black on almost black in dark mode.
 -   Decrypt screen would stay in memory infinitely, allowing passwords to be seen without re-auth
+-   Git commits in the store would wrongly use the 'default' committer as opposed to the user's configured one
 
 ## [1.13.1] - 2020-10-23
 

app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt

@@ -53,9 +53,8 @@ class GitCommandExecutor(
                             withContext(Dispatchers.IO) {
                                 val name = GitSettings.authorName.ifEmpty { "root" }
                                 val email = GitSettings.authorEmail.ifEmpty { "localhost" }
-                                command
-                                    .setAuthor(PersonIdent(name, email))
-                                    .call()
+                                val identity = PersonIdent(name, email)
+                                command.setAuthor(identity).setCommitter(identity).call()
                             }
                         }
                     }
@@ -64,7 +63,7 @@ class GitCommandExecutor(
                             command.call()
                         }
                         val rr = result.rebaseResult
-                        if (rr.status === RebaseResult.Status.STOPPED) {
+                        if (rr.status == RebaseResult.Status.STOPPED) {
                             throw PullException.PullRebaseFailed
                         }
                     }