diff --git a/plugins/git/git-from-directory b/plugins/git/git-from-directory
index 27ddde79b21..867b87c8cc5 100755
--- a/plugins/git/git-from-directory
+++ b/plugins/git/git-from-directory
@@ -19,7 +19,8 @@ trigger-git-git-from-directory() {
   trap "rm -rf '$TMP_WORK_DIR' '$TMP_WORK_DIR_2' >/dev/null" RETURN INT TERM EXIT
 
   dokku_log_info1 "Updating git repository with specified build context"
-  if [[ "$(fn-git-cmd "$APP_ROOT" count-objects)" == "0 objects, 0 kilobytes" ]]; then
+  local git_objects="$(fn-git-cmd "$APP_ROOT" count-objects 2>/dev/null || true)"
+  if [[ -z "$git_objects" ]] || [[ "$git_objects" == "0 objects, 0 kilobytes" ]]; then
     # setup new repo
     cp -rT "$SOURCECODE_WORK_DIR" "$TMP_WORK_DIR"
     suppress_output fn-git-cmd "$TMP_WORK_DIR" init
diff --git a/tests/unit/git_4.bats b/tests/unit/git_4.bats
index dd308b78685..f000042e293 100644
--- a/tests/unit/git_4.bats
+++ b/tests/unit/git_4.bats
@@ -29,6 +29,28 @@ teardown() {
   assert_success
 }
 
+@test "(git) git:from-image [normal-git-init]" {
+  run rm -rf "/home/dokku/$TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run mkdir "/home/dokku/$TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run chown -R dokku:dokku "/home/dokku/$TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}
+
 @test "(git) git:from-image [normal-cnb]" {
   run /bin/bash -c "dokku git:from-image $TEST_APP dokku/node-js-getting-started:latest"
   echo "output: $output"