diff --git a/src/linux/Packaging.Linux/pack.sh b/src/linux/Packaging.Linux/pack.sh index 249ffb8e8..14d26aee5 100755 --- a/src/linux/Packaging.Linux/pack.sh +++ b/src/linux/Packaging.Linux/pack.sh @@ -126,6 +126,6 @@ if [ ! -f "$LINK_TO/git-credential-manager" ]; then "$LINK_TO/git-credential-manager" || exit 1 fi -dpkg-deb -Zxz --build "$DEBROOT" "$DEBPKG" || exit 1 +dpkg-deb -Zxz --root-owner-group --build "$DEBROOT" "$DEBPKG" || exit 1 echo $MESSAGE diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj index fde8cb3a0..9071b6f89 100644 --- a/src/shared/Core/Core.csproj +++ b/src/shared/Core/Core.csproj @@ -13,25 +13,25 @@ - - + + - + - - + + - - - + + + - + diff --git a/src/shared/Core/Diagnostics/GitDiagnostic.cs b/src/shared/Core/Diagnostics/GitDiagnostic.cs index e09f091dd..74c4c76b3 100644 --- a/src/shared/Core/Diagnostics/GitDiagnostic.cs +++ b/src/shared/Core/Diagnostics/GitDiagnostic.cs @@ -19,9 +19,16 @@ protected override Task RunInternalAsync(StringBuilder log, IList log.AppendLine($"Git version is '{gitVersion.OriginalString}'"); log.Append("Locating current repository..."); - string thisRepo =CommandContext.Git.GetCurrentRepository(); + if (!CommandContext.Git.IsInsideRepository()) + { + log.AppendLine("Not inside a Git repository."); + } + else + { + string thisRepo = CommandContext.Git.GetCurrentRepository(); + log.AppendLine($"Git repository at '{thisRepo}'"); + } log.AppendLine(" OK"); - log.AppendLine(thisRepo is null ? "Not inside a Git repository." : $"Git repository at '{thisRepo}'"); log.Append("Listing all Git configuration..."); ChildProcess configProc = CommandContext.Git.CreateProcess("config --list --show-origin");