Merge pull request #1902 from tyrielv/tyrielv/hydration-s

Disable hydration status for -s/--short

Author: tyrielv

GVFS/GVFS.Hooks/Program.cs

@@ -105,7 +105,14 @@ private static bool ArgsBlockHydrationStatus(string[] args)
         {
             return args.Any(arg =>
                 arg.StartsWith("--serialize", StringComparison.OrdinalIgnoreCase)
-                || arg.StartsWith("--porcelain", StringComparison.OrdinalIgnoreCase));
+                || arg.StartsWith("--porcelain", StringComparison.OrdinalIgnoreCase)
+                || arg.Equals("--short", StringComparison.OrdinalIgnoreCase)
+                || HasShortFlag(arg, "s"));
+        }
+
+        private static bool HasShortFlag(string arg, string flag)
+        {
+            return arg.StartsWith("-") && !arg.StartsWith("--") && arg.Substring(1).Contains(flag);
         }
 
         private static bool ConfigurationAllowsHydrationStatus()