Merge pull request #4525 from dokku/4520-from-error

Update error for git:from- commands when the artifact is already synced

docs/development/plugin-triggers.md

@@ -698,6 +698,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `git-from-directory`
+
+- Description: Updates an app's git repository from a source directory and then triggers a build
+- Invoked by: `git:from-image` and `git:from-archive`
+- Arguments: `$APP $SOURCECODE_WORK_DIR $USER_NAME $USER_EMAIL`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `git-post-pull`
 
 - Description:

plugins/git/git-from-directory

@@ -42,7 +42,8 @@ trigger-git-git-from-directory() {
     suppress_output fn-git-cmd "$TMP_WORK_DIR" add --all
     suppress_output fn-git-cmd "$TMP_WORK_DIR" update-index --refresh
     if suppress_output fn-git-cmd "$TMP_WORK_DIR" diff-index --quiet HEAD --; then
-      dokku_log_warn "No changes detected, aborting git update"
+      dokku_log_warn "No changes detected, skipping git commit"
+      dokku_log_warn "Call 'ps:rebuild' on app to rebuild the app from existing source"
       return
     fi