Restore workaround for preventing empty commits (#1019)

* Revert "Add symlink support to JGit (#1016)"

This reverts commit 5032696cec9da86c2ad97b9931e8d85feb18da0c.

* Restore workaround for empty commits and document commands

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

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

3 files changed, 24 insertions, 2 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt
index 97ce6602..f06fc891 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt
@@ -27,6 +27,7 @@ import org.eclipse.jgit.api.CommitCommand
 import org.eclipse.jgit.api.PullCommand
 import org.eclipse.jgit.api.PushCommand
 import org.eclipse.jgit.api.RebaseResult
+import org.eclipse.jgit.api.StatusCommand
 import org.eclipse.jgit.transport.RemoteRefUpdate
 import org.eclipse.jgit.transport.SshSessionFactory
 
@@ -43,14 +44,24 @@ class GitCommandExecutor(
             message = activity.resources.getString(R.string.git_operation_running),
             length = Snackbar.LENGTH_INDEFINITE,
         )
+        // Count the number of uncommitted files
+        var nbChanges = 0
         var operationResult: Result = Result.Ok
         try {
             for (command in operation.commands) {
                 when (command) {
+                    is StatusCommand -> {
+                        val res = withContext(Dispatchers.IO) {
+                            command.call()
+                        }
+                        nbChanges = res.uncommittedChanges.size
+                    }
                     is CommitCommand -> {
                         // the previous status will eventually be used to avoid a commit
-                        withContext(Dispatchers.IO) {
-                            command.call()
+                        if (nbChanges > 0) {
+                            withContext(Dispatchers.IO) {
+                                command.call()
+                            }
                         }
                     }
                     is PullCommand -> {
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/ResetToRemoteOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/ResetToRemoteOperation.kt
index f0aee212..0d0dc019 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/ResetToRemoteOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/ResetToRemoteOperation.kt
@@ -18,9 +18,14 @@ import org.eclipse.jgit.api.ResetCommand
 class ResetToRemoteOperation(fileDir: File, callingActivity: AppCompatActivity) : GitOperation(fileDir, callingActivity) {
 
     override val commands = arrayOf(
+        // Stage all files
         git.add().addFilepattern("."),
+        // Fetch everything from the origin remote
         git.fetch().setRemote("origin"),
+        // Do a hard reset to the remote branch. Equivalent to git reset --hard origin/$remoteBranch
         git.reset().setRef("origin/$remoteBranch").setMode(ResetCommand.ResetType.HARD),
+        // Force-create $remoteBranch if it doesn't exist. This covers the case where you switched
+        // branches from 'master' to anything else.
         git.branchCreate().setName(remoteBranch).setForce(true),
     )
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/SyncOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/SyncOperation.kt
index 223f2cd8..35b12810 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/SyncOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/SyncOperation.kt
@@ -17,9 +17,15 @@ import java.io.File
 class SyncOperation(fileDir: File, callingActivity: AppCompatActivity) : GitOperation(fileDir, callingActivity) {
 
     override val commands = arrayOf(
+        // Stage all files
         git.add().addFilepattern("."),
+        // Populate the changed files count
+        git.status(),
+        // Commit everything! If needed, obviously.
         git.commit().setAll(true).setMessage("[Android Password Store] Sync"),
+        // Pull and rebase on top of the remote branch
         git.pull().setRebase(true).setRemote("origin"),
+        // Push it all back
         git.push().setPushAll().setRemote("origin"),
     )