6967: Use git status --porcelain to isolate from user config

diff --git a/apps/workbench/lib/app_version.rb b/apps/workbench/lib/app_version.rb
index 05b9f2694d26bb81113d46d9db8ea1e5a00ebe1f..bf50ee4adb103ecc3fe4b145b866c1e30f0b37db 100644 (file)
--- a/apps/workbench/lib/app_version.rb
+++ b/apps/workbench/lib/app_version.rb
@@ -30,7 +30,7 @@ class AppVersion
     if @hash.nil? or @hash.empty?
       begin
         local_modified = false
-        git("status", "-s") do |git_pipe|
+        git("status", "--porcelain") do |git_pipe|
           git_pipe.each_line do |_|
             STDERR.puts _
             local_modified = true

diff --git a/services/api/lib/app_version.rb b/services/api/lib/app_version.rb
index 2f235d1eabe35cf388278435459ae78947107cde..769f4e5ed86cbf65f2ee8afd1ad79a1c47bea1dc 100644 (file)
--- a/services/api/lib/app_version.rb
+++ b/services/api/lib/app_version.rb
@@ -30,7 +30,7 @@ class AppVersion
     if @hash.nil? or @hash.empty?
       begin
         local_modified = false
-        git("status", "-s") do |git_pipe|
+        git("status", "--porcelain") do |git_pipe|
           git_pipe.each_line do |_|
             local_modified = true
             # Continue reading the pipe so git doesn't get SIGPIPE.